Snap for 5681426 from 732b5475bd6b3bda565368add190a20de2e1d28f to qt-release

Change-Id: I5cce5da5ef713b6d063610775c8ec1cf4a14f660
diff --git a/29/32/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump
index b8dfd34..fbde119 100644
--- a/29/32/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump
@@ -11,6 +11,60 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "char [10]",
+   "name" : "char [10]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3654",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [11]",
+   "name" : "char [11]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3677",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [12]",
+   "name" : "char [12]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3651",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [13]",
+   "name" : "char [13]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3647",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [14]",
+   "name" : "char [14]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3696",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [15]",
+   "name" : "char [15]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3794",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
    "referenced_type" : "type-48",
@@ -19,6 +73,186 @@
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [17]",
+   "name" : "char [17]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3699",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [18]",
+   "name" : "char [18]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3683",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [19]",
+   "name" : "char [19]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3715",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [20]",
+   "name" : "char [20]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3693",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [22]",
+   "name" : "char [22]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3718",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [25]",
+   "name" : "char [25]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3708",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [28]",
+   "name" : "char [28]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3730",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [29]",
+   "name" : "char [29]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3705",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [2]",
+   "name" : "char [2]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3658",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [31]",
+   "name" : "char [31]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3690",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3722",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [35]",
+   "name" : "char [35]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3711",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [37]",
+   "name" : "char [37]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3702",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [3]",
+   "name" : "char [3]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3670",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4]",
+   "name" : "char [4]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3791",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [5]",
+   "name" : "char [5]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3797",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [6]",
+   "name" : "char [6]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3662",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [7]",
+   "name" : "char [7]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3686",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [8]",
+   "name" : "char [8]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3674",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [9]",
+   "name" : "char [9]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3665",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
    "referenced_type" : "type-298",
@@ -227,10 +461,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
   },
   {
@@ -1182,6 +1432,78 @@
    "name" : "_ZN7android4hidl7manager4V1_218BpHwServiceManagerC2ERKNS_2spINS_8hardware7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE"
   },
   {
@@ -1212,6 +1534,36 @@
    "name" : "_ZN7android8hardware10HidlMemoryD2Ev"
   },
   {
+   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD2Ev"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
@@ -1228,6 +1580,30 @@
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl7manager4V1_215IServiceManagerENS4_18BpHwServiceManagerENS4_18BnHwServiceManagerEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware11hidl_handle10freeHandleEv"
   },
   {
@@ -1339,18 +1715,243 @@
    "name" : "_ZN7android8hardware11hidl_stringaSERKS1_"
   },
   {
+   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_6StatusEPNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKjjPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
    "name" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware14readFromParcelERKNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_"
   },
   {
@@ -1363,9 +1964,45 @@
    "name" : "_ZN7android8hardware16setRequestingSidERKNS_2spINS_4hidl4base4V1_05IBaseEEEb"
   },
   {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android8hardware17joinRpcThreadpoolEv"
   },
   {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE"
   },
   {
@@ -1384,6 +2021,9 @@
    "name" : "_ZN7android8hardware20LazyServiceRegistrarC2Ev"
   },
   {
+   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware21defaultServiceManagerEv"
   },
   {
@@ -1450,6 +2090,184 @@
    "name" : "_ZN7android8hardware31setProcessHidlReturnRestrictionENS0_21HidlReturnRestrictionE"
   },
   {
+   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKjjPFvPS1_S3_jS5_jPvES7_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel6removeEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8growDataEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9initStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware6Status11fromStatusTEi"
   },
   {
@@ -1480,6 +2298,30 @@
    "name" : "_ZN7android8hardware6StatusC2EiiPKc"
   },
   {
+   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE"
   },
   {
@@ -1659,12 +2501,75 @@
    "name" : "_ZN7android8hardware7details25registerAsServiceInternalERKNS_2spINS_4hidl4base4V1_05IBaseEEERKNSt3__112basic_stringIcNSA_11char_traitsIcEENSA_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
+  },
+  {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE"
   },
   {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE"
   },
   {
+   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv"
   },
   {
@@ -1686,12 +2591,259 @@
    "name" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv"
   },
   {
+   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4dataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
+  },
+  {
    "name" : "_ZNK7android8hardware6Status11descriptionEv"
   },
   {
+   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware7details13return_status8assertOkEv"
   },
   {
+   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNKSt3__110__back_refIcE6__execERNS_7__stateIcEE"
   },
@@ -2544,12 +3696,66 @@
    "name" : "_ZTv0_n12_N7android4hidl7manager4V1_218BnHwServiceManagerD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+  },
+  {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD0Ev"
   },
   {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
    "name" : "__aeabi_l2d"
   },
   {
@@ -2608,6 +3814,18 @@
   },
   {
    "name" : "__udivsi3"
+  },
+  {
+   "name" : "getHWBinderKernelReferences"
+  },
+  {
+   "name" : "printHexData"
+  },
+  {
+   "name" : "printTypeCode"
+  },
+  {
+   "name" : "stringForIndent"
   }
  ],
  "elf_objects" :
@@ -2659,6 +3877,21 @@
    "name" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE"
   },
   {
+   "name" : "_ZN7android8hardware12gTextBuffersE"
+  },
+  {
+   "name" : "_ZN7android8hardware13gProcessMutexE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aerrE"
+  },
+  {
+   "name" : "_ZN7android8hardware4alogE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aoutE"
+  },
+  {
    "name" : "_ZN7android8hardware7details14gServiceSidMapE"
   },
   {
@@ -2674,6 +3907,9 @@
    "name" : "_ZN7android8hardware7details6gBnMapE"
   },
   {
+   "name" : "_ZN7android8hardware8gProcessE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android4hidl4base4V1_06BsBaseE0_NS2_5IBaseE"
   },
@@ -2869,6 +4105,13 @@
    "name" : "_ZTCN7android4hidl7manager4V1_218BpHwServiceManagerE8_NS_8hardware11BpHwRefBaseE"
   },
   {
+   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE0_NS4_5IBaseE"
   },
@@ -2898,6 +4141,9 @@
    "name" : "_ZTCN7android8hardware7details6WaiterE0_NS_4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE0_NS_13basic_istreamIcS2_EE"
   },
@@ -2915,6 +4161,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
   },
   {
@@ -2972,16 +4230,31 @@
    "name" : "_ZTTN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "name" : "_ZTTN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTTN7android8hardware10IInterfaceE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
+   "name" : "_ZTTN7android8hardware12ProcessStateE"
+  },
+  {
    "name" : "_ZTTN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTTN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware7details21ClientCounterCallbackE"
   },
   {
@@ -2989,6 +4262,9 @@
    "name" : "_ZTTN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTTN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE"
   },
@@ -3001,6 +4277,14 @@
    "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
    "name" : "_ZTVN7android4hidl4base4V1_05IBaseE"
   },
   {
@@ -3079,20 +4363,85 @@
    "name" : "_ZTVN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIiEE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTVN7android8hardware10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware10PoolThreadE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10TextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android8hardware12FdTextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware12ProcessStateE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware13LogTextOutputE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android8hardware25PassthroughServiceManagerE"
   },
   {
    "name" : "_ZTVN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTVN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware7details16HidlInstrumentorE"
   },
   {
@@ -3103,6 +4452,9 @@
    "name" : "_ZTVN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTVN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__110__back_refIcEE"
   },
@@ -3188,6 +4540,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -3391,6 +4747,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-19",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -4468,6 +5850,42 @@
  [
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2474"
+    }
+   ],
+   "referenced_type" : "type-2478",
+   "return_type" : "type-2474",
+   "self_type" : "type-2478",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-350"
+    },
+    {
+     "referenced_type" : "type-69"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2429",
+   "return_type" : "type-44",
+   "self_type" : "type-2429",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (void *)",
    "name" : "int (void *)",
    "parameters" :
@@ -4480,6 +5898,90 @@
    "return_type" : "type-19",
    "self_type" : "type-303",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2490"
+    }
+   ],
+   "referenced_type" : "type-2489",
+   "return_type" : "type-2490",
+   "self_type" : "type-2489",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2352"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2351",
+   "return_type" : "type-106",
+   "self_type" : "type-2351",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (const void *, void *, void *)",
+   "name" : "void (const void *, void *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2346",
+   "return_type" : "type-106",
+   "self_type" : "type-2346",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (void *, const char *)",
+   "name" : "void (void *, const char *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "referenced_type" : "type-2539",
+   "return_type" : "type-106",
+   "self_type" : "type-2539",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "functions" :
@@ -4498,6 +6000,22 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-495"
+    },
+    {
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-3839",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::PassthroughServiceManager>::~sp",
    "linker_set_key" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev",
    "parameters" :
@@ -4511,6 +6029,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-482"
+    },
+    {
+     "referenced_type" : "type-483"
+    }
+   ],
+   "return_type" : "type-485",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-482"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-485",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2380"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-3754",
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::hidl::base::V1_0::IBase::linkToDeath",
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy",
    "parameters" :
@@ -4539,7 +6105,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2574"
+     "referenced_type" : "type-2765"
     }
    ],
    "return_type" : "type-102",
@@ -4555,7 +6121,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2575"
+     "referenced_type" : "type-2766"
     }
    ],
    "return_type" : "type-102",
@@ -4587,7 +6153,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2576"
+     "referenced_type" : "type-2767"
     }
    ],
    "return_type" : "type-102",
@@ -4603,7 +6169,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2577"
+     "referenced_type" : "type-2768"
     }
    ],
    "return_type" : "type-102",
@@ -4691,10 +6257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
-     "referenced_type" : "type-2580"
+     "referenced_type" : "type-2771"
     }
    ],
    "return_type" : "type-102",
@@ -4707,7 +6273,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
      "referenced_type" : "type-459"
@@ -4723,7 +6289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
      "referenced_type" : "type-459"
@@ -4741,13 +6307,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2774"
     }
    ],
    "return_type" : "type-19",
@@ -4766,10 +6332,10 @@
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
      "default_arg" : true,
@@ -4777,7 +6343,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2584"
+     "referenced_type" : "type-2775"
     }
    ],
    "return_type" : "type-19",
@@ -4792,13 +6358,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2585"
+     "referenced_type" : "type-2776"
     }
    ],
    "return_type" : "type-19",
@@ -4815,7 +6381,7 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2586"
+     "referenced_type" : "type-2777"
     }
    ],
    "return_type" : "type-102",
@@ -4830,13 +6396,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2587"
+     "referenced_type" : "type-2778"
     }
    ],
    "return_type" : "type-19",
@@ -4851,13 +6417,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2588"
+     "referenced_type" : "type-2779"
     }
    ],
    "return_type" : "type-19",
@@ -4872,13 +6438,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2780"
     }
    ],
    "return_type" : "type-19",
@@ -4893,13 +6459,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2781"
     }
    ],
    "return_type" : "type-19",
@@ -4914,13 +6480,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2591"
+     "referenced_type" : "type-2782"
     }
    ],
    "return_type" : "type-19",
@@ -4969,10 +6535,10 @@
      "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     }
    ],
    "return_type" : "type-106",
@@ -5007,10 +6573,10 @@
      "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     }
    ],
    "return_type" : "type-106",
@@ -5061,7 +6627,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5076,7 +6642,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5120,7 +6686,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2592"
+     "referenced_type" : "type-2783"
     }
    ],
    "return_type" : "type-102",
@@ -5136,7 +6702,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2593"
+     "referenced_type" : "type-2784"
     }
    ],
    "return_type" : "type-102",
@@ -5168,7 +6734,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2594"
+     "referenced_type" : "type-2785"
     }
    ],
    "return_type" : "type-102",
@@ -5180,13 +6746,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2786"
     }
    ],
    "return_type" : "type-102",
@@ -5198,13 +6764,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2596"
+     "referenced_type" : "type-2787"
     }
    ],
    "return_type" : "type-102",
@@ -5220,7 +6786,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2597"
+     "referenced_type" : "type-2788"
     }
    ],
    "return_type" : "type-102",
@@ -5232,13 +6798,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2789"
     }
    ],
    "return_type" : "type-102",
@@ -5276,13 +6842,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2599"
+     "referenced_type" : "type-2790"
     }
    ],
    "return_type" : "type-102",
@@ -5294,7 +6860,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5309,7 +6875,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -9924,6 +11490,416 @@
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2405"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-2335",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::sendObituary",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2423"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2423"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2423"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2423"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2423"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2423"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2423"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2359"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-949"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2414"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2354"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2791"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::HidlMemory::getInstance",
    "linker_set_key" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE",
    "parameters" :
@@ -10079,6 +12055,137 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2551"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2544"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2548"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2548"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2548"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2548"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3884"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3884"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3884"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3884"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::fromBinder",
    "linker_set_key" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE",
    "parameters" :
@@ -10131,6 +12238,133 @@
    "template_args" : [ "type-565", "type-774", "type-845" ]
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
    "access" : "private",
    "function_name" : "android::hardware::hidl_handle::freeHandle",
    "linker_set_key" : "_ZN7android8hardware11hidl_handle10freeHandleEv",
@@ -10712,6 +12946,415 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMaxThreads",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::startThreadPool",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-350"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-69"
+    },
+    {
+     "referenced_type" : "type-350"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-3807",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setCallRestriction",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-2432"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getKernelReferences",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::becomeContextManager",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-2431"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-221",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-2381",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::self",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2441"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "function_name" : "android::hardware::writeToParcel",
    "linker_set_key" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE",
    "parameters" :
@@ -10742,6 +13385,699 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKjjPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2352"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
+   "return_type" : "type-3636",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::clearCaller",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::stopProcess",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setupPolling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::flushCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearLastError",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::executeCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-3642"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-472"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-447",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2354"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-447"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::self",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
+   "return_type" : "type-3636",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::process",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::shutdown",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::transact",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2354"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::sendReply",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    },
+    {
+     "referenced_type" : "type-2354"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3636"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
    "function_name" : "android::hardware::readFromParcel",
    "linker_set_key" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE",
    "parameters" :
@@ -10769,6 +14105,24 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::release_object",
+   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3620"
+    },
+    {
+     "referenced_type" : "type-3769"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::interfacesEqual",
    "linker_set_key" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_",
    "parameters" :
@@ -10811,6 +14165,143 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
+   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2505"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2505"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
+   "return_type" : "type-2506",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::print",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2505"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2505"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2505"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2505"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2505"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2505"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::addPostCommandTask",
    "linker_set_key" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE",
    "parameters" :
@@ -11200,6 +14691,934 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::Parcel::writeFloat",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-298"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-447"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-199"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::finishWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeDouble",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-4"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeObject",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3769"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-4081" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-132"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-21"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::restartWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeCString",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInplace",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::writePointer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::continueWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-343"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-350"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUnpadded",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::acquireObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::freeDataNoInit",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::releaseObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataCapacity",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeWeakBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3750"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeStrongBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKjjPFvPS1_S3_jS5_jPvES7_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2352"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2350"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
+   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::incrementNumReferences",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
+   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::write",
+   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::remove",
+   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::freeData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::growData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setError",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::initState",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBool",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-550"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::fromStatusT",
    "linker_set_key" : "_ZN7android8hardware6Status11fromStatusTEi",
    "parameters" :
@@ -11366,6 +15785,133 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2485"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2485"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-2332",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-2335",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::TaskRunner::push",
    "linker_set_key" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE",
    "parameters" :
@@ -12055,6 +16601,341 @@
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::onTransact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2354"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2792"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-2357"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-2332",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-2359"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-949"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-2362",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2354"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2793"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2474"
+    },
+    {
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-2474",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2474"
+    },
+    {
+     "referenced_type" : "type-3885"
+    }
+   ],
+   "return_type" : "type-2474",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::operator<<",
    "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE",
    "parameters" :
@@ -12085,6 +16966,38 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::BpHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2372"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2425"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::hidl_handle::getNativeHandle",
    "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv",
    "parameters" :
@@ -12176,6 +17089,1265 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::isContextManager",
+   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3845"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3639"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3639"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3639"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isServingCall",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3639"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3639"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3639"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
+   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2509"
+    }
+   ],
+   "return_type" : "type-2469",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::clearCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::errorCheck",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::findBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3777"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3781"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3781"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3776"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-3780",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-4082" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3772"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3774"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-21",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::scanForFds",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcDataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readCString",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-139",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::updateCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataCapacity",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::objectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-352"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3778"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-342",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcBufferSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3781"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3777"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readWeakBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-2381",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::quickFindBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::enforceInterface",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-482"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3781"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3781"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::verifyBufferObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3785"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16Inplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-343",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferChild",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferParent",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3781"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3777"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3782"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3782"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-482"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3781"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3782"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3782"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3782"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::data",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1030",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::read",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::print",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-2474"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcData",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::objects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-2352",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3777"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3770"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataAvail",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3775"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-298",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3771"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-3773"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    }
+   ],
+   "return_type" : "type-447",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3763"
+    },
+    {
+     "referenced_type" : "type-291"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::description",
    "linker_set_key" : "_ZNK7android8hardware6Status11descriptionEv",
    "parameters" :
@@ -12189,6 +18361,22 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::IBinder::checkSubclass",
+   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2331"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::return_status::assertOk",
    "linker_set_key" : "_ZNK7android8hardware7details13return_status8assertOkEv",
    "parameters" :
@@ -12200,6 +18388,213 @@
    ],
    "return_type" : "type-106",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2361"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2368"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::getHWBinderKernelReferences",
+   "linker_set_key" : "getHWBinderKernelReferences",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printHexData",
+   "linker_set_key" : "printHexData",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-19"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2540"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printTypeCode",
+   "linker_set_key" : "printTypeCode",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2540"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::stringForIndent",
+   "linker_set_key" : "stringForIndent",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "global_vars" :
@@ -12265,6 +18660,36 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
+   "name" : "android::hardware::gTextBuffers",
+   "referenced_type" : "type-2512",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
+   "name" : "android::hardware::gProcessMutex",
+   "referenced_type" : "type-440",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aerrE",
+   "name" : "android::hardware::aerr",
+   "referenced_type" : "type-2474",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4alogE",
+   "name" : "android::hardware::alog",
+   "referenced_type" : "type-2474",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aoutE",
+   "name" : "android::hardware::aout",
+   "referenced_type" : "type-2474",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
    "referenced_type" : "type-703",
@@ -12281,6 +18706,12 @@
    "name" : "android::hardware::details::gBnMap",
    "referenced_type" : "type-412",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware8gProcessE",
+   "name" : "android::hardware::gProcess",
+   "referenced_type" : "type-2794",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
   }
  ],
  "lvalue_reference_types" :
@@ -12305,6 +18736,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const &",
+   "name" : "android::RefBase *const &",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const &",
+   "name" : "android::RefBase::weakref_type *const &",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
    "referenced_type" : "type-342",
@@ -12323,6 +18772,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const &",
+   "name" : "android::hardware::BHwBinder *const &",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3624",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "referenced_type" : "type-29",
@@ -12359,6 +18817,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump &",
+   "name" : "android::hardware::HexDump &",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2486",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
    "referenced_type" : "type-1376",
@@ -12370,8 +18837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2574",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12386,6 +18853,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel &",
+   "name" : "android::hardware::Parcel &",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
+   "name" : "android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-3831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "referenced_type" : "type-807",
@@ -12476,6 +18961,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2427",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "referenced_type" : "type-1009",
@@ -12620,6 +19159,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
+   "name" : "android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-472",
+   "self_type" : "type-3633",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
    "referenced_type" : "type-71",
@@ -12629,6 +19204,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
+   "name" : "android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-491",
+   "self_type" : "type-3839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
    "referenced_type" : "type-789",
@@ -12710,6 +19294,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-944",
+   "self_type" : "type-2403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
+   "name" : "android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-3754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "referenced_type" : "type-32",
@@ -12719,6 +19321,258 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "char *const &",
+   "name" : "char *const &",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[10]",
+   "name" : "char const (&)[10]",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3655",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[11]",
+   "name" : "char const (&)[11]",
+   "referenced_type" : "type-3676",
+   "self_type" : "type-3678",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[12]",
+   "name" : "char const (&)[12]",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[13]",
+   "name" : "char const (&)[13]",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3649",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[14]",
+   "name" : "char const (&)[14]",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3697",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[15]",
+   "name" : "char const (&)[15]",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3795",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[16]",
+   "name" : "char const (&)[16]",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3680",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[17]",
+   "name" : "char const (&)[17]",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3700",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[18]",
+   "name" : "char const (&)[18]",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[19]",
+   "name" : "char const (&)[19]",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3716",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[20]",
+   "name" : "char const (&)[20]",
+   "referenced_type" : "type-3692",
+   "self_type" : "type-3694",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[22]",
+   "name" : "char const (&)[22]",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3720",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[25]",
+   "name" : "char const (&)[25]",
+   "referenced_type" : "type-3707",
+   "self_type" : "type-3709",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[28]",
+   "name" : "char const (&)[28]",
+   "referenced_type" : "type-3729",
+   "self_type" : "type-3731",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[29]",
+   "name" : "char const (&)[29]",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3706",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[2]",
+   "name" : "char const (&)[2]",
+   "referenced_type" : "type-3657",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[31]",
+   "name" : "char const (&)[31]",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3691",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[32]",
+   "name" : "char const (&)[32]",
+   "referenced_type" : "type-3721",
+   "self_type" : "type-3723",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[35]",
+   "name" : "char const (&)[35]",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3712",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[37]",
+   "name" : "char const (&)[37]",
+   "referenced_type" : "type-3701",
+   "self_type" : "type-3703",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[3]",
+   "name" : "char const (&)[3]",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3672",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[4]",
+   "name" : "char const (&)[4]",
+   "referenced_type" : "type-3790",
+   "self_type" : "type-3792",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[5]",
+   "name" : "char const (&)[5]",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3798",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[6]",
+   "name" : "char const (&)[6]",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[7]",
+   "name" : "char const (&)[7]",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[8]",
+   "name" : "char const (&)[8]",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3675",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[9]",
+   "name" : "char const (&)[9]",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3666",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-348",
@@ -12737,6 +19591,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
+   "name" : "const android::hardware::BpHwBinder::Obituary &",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2398",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump &",
+   "name" : "const android::hardware::HexDump &",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-3886",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
    "referenced_type" : "type-1038",
@@ -12793,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1966",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12802,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2078",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2050",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12811,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12820,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -12829,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12838,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -12847,8 +19728,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2354",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2571",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12856,6 +19746,60 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3104",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3185",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3251",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3309",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3352",
+   "self_type" : "type-3354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3410",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
    "referenced_type" : "type-368",
    "self_type" : "type-370",
    "size" : 4,
@@ -12863,6 +19807,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3915",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
+   "name" : "const android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-3810",
+   "self_type" : "type-3832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
    "referenced_type" : "type-506",
@@ -12890,6 +19852,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode &",
+   "name" : "const android::hardware::TypeCode &",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
    "referenced_type" : "type-1050",
@@ -12946,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13016,6 +19987,105 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3804",
+   "self_type" : "type-3806",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
+   "name" : "const android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2357",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3467",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2524",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2538",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3585",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3592",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
    "referenced_type" : "type-70",
@@ -13025,6 +20095,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
+   "name" : "const android::sp<android::hardware::IInterface> &",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "referenced_type" : "type-765",
@@ -13034,6 +20113,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
+   "name" : "const android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-496",
+   "self_type" : "type-3620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "referenced_type" : "type-950",
@@ -13115,6 +20203,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2359",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
    "referenced_type" : "type-1367",
@@ -13126,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13142,6 +20239,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3750",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3912",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "referenced_type" : "type-464",
@@ -13169,6 +20284,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const char &",
+   "name" : "const char &",
+   "referenced_type" : "type-100",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *const &",
+   "name" : "const char *const &",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-3",
@@ -13178,6 +20311,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object &",
+   "name" : "const flat_binder_object &",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
    "referenced_type" : "type-665",
@@ -13267,113 +20409,162 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1695",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1735",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1799",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1832",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1976",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1941",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2053",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2026",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2216",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2262",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2313",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2552",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2656",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2496",
-   "self_type" : "type-2498",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2726",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2571",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2836",
+   "self_type" : "type-2838",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2874",
+   "self_type" : "type-2876",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2935",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2940",
+   "self_type" : "type-2943",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3011",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3081",
+   "self_type" : "type-3083",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3162",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3227",
+   "self_type" : "type-3229",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13386,6 +20577,62 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3282",
+   "self_type" : "type-3284",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3334",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3343",
+   "self_type" : "type-3345",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3389",
+   "self_type" : "type-3391",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3435",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3894",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4002",
+   "self_type" : "type-4004",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4076",
+   "self_type" : "type-4078",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
    "referenced_type" : "type-515",
    "self_type" : "type-517",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -13569,17 +20816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1708",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13587,8 +20825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -13596,8 +20834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13605,8 +20843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2070",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13614,6 +20852,15 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2037",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "type-206",
    "self_type" : "type-214",
    "size" : 4,
@@ -13623,8 +20870,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2096",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13632,17 +20879,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2086",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2129",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13650,8 +20888,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13659,26 +20897,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2199",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2252",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -13686,8 +20906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2599",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13695,8 +20915,143 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2510",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2742",
+   "self_type" : "type-2744",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2813",
+   "self_type" : "type-2815",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2877",
+   "self_type" : "type-2881",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2962",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3112",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3150",
+   "self_type" : "type-3184",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3171",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3193",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3236",
+   "self_type" : "type-3238",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3293",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3306",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3357",
+   "self_type" : "type-3359",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3401",
+   "self_type" : "type-3407",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3940",
+   "self_type" : "type-3942",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4016",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13758,8 +21113,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-2808",
+   "self_type" : "type-2807",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13785,8 +21149,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2592",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
+   "name" : "const std::function<sp<IBinder> (void *)> &",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13812,8 +21185,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2310",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13828,10 +21201,46 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3758",
+   "self_type" : "type-3762",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3766",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1806",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2950",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13947,8 +21356,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13956,8 +21365,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1740",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13965,8 +21374,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1849",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13974,8 +21383,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13983,8 +21392,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13992,8 +21401,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14001,8 +21410,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14010,8 +21419,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14028,17 +21437,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2148",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14055,6 +21455,15 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "referenced_type" : "type-219",
    "self_type" : "type-218",
    "size" : 4,
@@ -14064,8 +21473,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14073,8 +21482,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14082,8 +21491,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14091,8 +21500,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14100,8 +21509,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2688",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14109,8 +21518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2752",
+   "self_type" : "type-2751",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14118,8 +21527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2824",
+   "self_type" : "type-2823",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14127,8 +21536,143 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2860",
+   "self_type" : "type-2859",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2992",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3004",
+   "self_type" : "type-3003",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3026",
+   "self_type" : "type-3025",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3138",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3191",
+   "self_type" : "type-3190",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3197",
+   "self_type" : "type-3196",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3215",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3425",
+   "self_type" : "type-3424",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14145,6 +21689,24 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3926",
+   "self_type" : "type-3925",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4040",
+   "self_type" : "type-4039",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "referenced_type" : "type-568",
    "self_type" : "type-567",
    "size" : 4,
@@ -14233,6 +21795,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned char *const &",
+   "name" : "const unsigned char *const &",
+   "referenced_type" : "type-3725",
+   "self_type" : "type-3726",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
    "referenced_type" : "type-246",
@@ -14242,6 +21813,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *const &",
+   "name" : "const unsigned int *const &",
+   "referenced_type" : "type-3727",
+   "self_type" : "type-3728",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
    "referenced_type" : "type-661",
@@ -14260,6 +21840,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void *const &",
+   "name" : "const void *const &",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2386",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-19",
@@ -14289,8 +21878,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14298,17 +21887,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2210",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14316,6 +21896,15 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2490",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 4,
@@ -14325,6 +21914,78 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2892",
+   "self_type" : "type-2891",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3736",
+   "self_type" : "type-3735",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3801",
+   "self_type" : "type-3800",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3877",
+   "self_type" : "type-3876",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
    "referenced_type" : "type-822",
    "self_type" : "type-821",
    "size" : 4,
@@ -14338,6 +21999,15 @@
    "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *const &",
+   "name" : "void *const &",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3668",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   }
  ],
  "pointer_types" :
@@ -14371,6 +22041,78 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2436",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3537",
+   "self_type" : "type-3536",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3635",
+   "self_type" : "type-3634",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3843",
+   "self_type" : "type-3842",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3881",
+   "self_type" : "type-3880",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-433",
+   "self_type" : "type-3833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2416",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
    "referenced_type" : "type-436",
@@ -14425,6 +22167,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase **",
+   "name" : "android::RefBase **",
+   "referenced_type" : "type-68",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const *",
+   "name" : "android::RefBase *const *",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-1100",
@@ -14490,8 +22250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14499,8 +22259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14508,8 +22268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1763",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1728",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14517,8 +22277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14526,8 +22286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14535,8 +22295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14544,8 +22304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2051",
-   "self_type" : "type-2050",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14553,8 +22313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14562,8 +22322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14571,8 +22331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14580,8 +22340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14589,8 +22349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14598,8 +22358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14607,8 +22367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14616,8 +22376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14625,8 +22385,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2720",
+   "self_type" : "type-2719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14643,6 +22439,69 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3006",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-321",
    "self_type" : "type-320",
    "size" : 4,
@@ -14652,6 +22511,168 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3278",
+   "self_type" : "type-3277",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3340",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3387",
+   "self_type" : "type-3386",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3446",
+   "self_type" : "type-3445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3566",
+   "self_type" : "type-3565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3595",
+   "self_type" : "type-3594",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3752",
+   "self_type" : "type-3751",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3819",
+   "self_type" : "type-3818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4000",
+   "self_type" : "type-3999",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-511",
    "self_type" : "type-510",
    "size" : 4,
@@ -14749,6 +22770,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type **",
+   "name" : "android::RefBase::weakref_type **",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const *",
+   "name" : "android::RefBase::weakref_type *const *",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3608",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
    "referenced_type" : "type-9",
@@ -14767,6 +22806,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
    "referenced_type" : "type-342",
@@ -14794,6 +22851,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase *> *",
+   "name" : "android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-432",
+   "self_type" : "type-3629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-431",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Vector<android::String8> *",
    "name" : "android::Vector<android::String8> *",
    "referenced_type" : "type-252",
@@ -14803,6 +22878,96 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-3621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2338",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-428",
+   "self_type" : "type-3827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
    "referenced_type" : "type-182",
@@ -14859,8 +23024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14868,8 +23033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14877,8 +23042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14886,8 +23051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14895,8 +23060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14904,8 +23069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14913,8 +23078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14922,8 +23087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14931,8 +23096,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2903",
+   "self_type" : "type-2902",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3030",
+   "self_type" : "type-3029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3142",
+   "self_type" : "type-3141",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3322",
+   "self_type" : "type-3321",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14949,6 +23195,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3924",
+   "self_type" : "type-3923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
    "referenced_type" : "type-782",
    "self_type" : "type-781",
    "size" : 4,
@@ -14974,6 +23229,132 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder **",
+   "name" : "android::hardware::BHwBinder **",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-3602",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const *",
+   "name" : "android::hardware::BHwBinder *const *",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3472",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder *",
+   "name" : "android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2335",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
+   "name" : "android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2423",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwRefBase *",
+   "name" : "android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput *",
+   "name" : "android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3543",
+   "self_type" : "type-3542",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3879",
+   "self_type" : "type-3878",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2506",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3571",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "referenced_type" : "type-29",
@@ -15028,6 +23409,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump *",
+   "name" : "android::hardware::HexDump *",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::HidlMemory *",
    "name" : "android::hardware::HidlMemory *",
    "referenced_type" : "type-159",
@@ -15102,8 +23492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15111,8 +23501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15120,8 +23510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15129,8 +23519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1924",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15138,8 +23528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15147,8 +23537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15156,8 +23546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15165,8 +23555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15174,8 +23564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15183,8 +23573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15192,8 +23582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15201,8 +23591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15210,8 +23600,134 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2694",
+   "self_type" : "type-2693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3050",
+   "self_type" : "type-3049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3145",
+   "self_type" : "type-3144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3208",
+   "self_type" : "type-3207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3327",
+   "self_type" : "type-3326",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3442",
+   "self_type" : "type-3441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-4044",
+   "self_type" : "type-4043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15327,8 +23843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15336,8 +23852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15345,8 +23861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15354,8 +23870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15363,8 +23879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15372,8 +23888,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2379",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3200",
+   "self_type" : "type-3199",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3316",
+   "self_type" : "type-3315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3428",
+   "self_type" : "type-3427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15426,8 +24005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15435,8 +24014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2040",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15444,8 +24023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2067",
+   "self_type" : "type-2066",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15453,8 +24032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15462,8 +24041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15471,8 +24050,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2548",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3147",
+   "self_type" : "type-3146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3212",
+   "self_type" : "type-3211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3329",
+   "self_type" : "type-3328",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15487,6 +24129,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::IPCThreadState *",
+   "name" : "android::hardware::IPCThreadState *",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-3636",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
    "referenced_type" : "type-530",
@@ -15552,8 +24203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15561,8 +24212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15570,8 +24221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15579,8 +24230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15588,8 +24239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15597,8 +24248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15606,8 +24257,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2572",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15615,6 +24275,60 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3109",
+   "self_type" : "type-3108",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3187",
+   "self_type" : "type-3186",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3311",
+   "self_type" : "type-3310",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3356",
+   "self_type" : "type-3355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3412",
+   "self_type" : "type-3411",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
    "referenced_type" : "type-372",
    "self_type" : "type-371",
    "size" : 4,
@@ -15622,10 +24336,28 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3917",
+   "self_type" : "type-3916",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PassthroughServiceManager *",
+   "name" : "android::hardware::PassthroughServiceManager *",
+   "referenced_type" : "type-2896",
+   "self_type" : "type-2895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15640,6 +24372,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::PoolThread *",
+   "name" : "android::hardware::PoolThread *",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
    "referenced_type" : "type-1091",
@@ -15687,8 +24428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15696,8 +24437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15705,8 +24446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2041",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15714,8 +24455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15723,8 +24464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2159",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15732,8 +24473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15741,8 +24482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15750,8 +24491,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3000",
+   "self_type" : "type-2999",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3149",
+   "self_type" : "type-3148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3266",
+   "self_type" : "type-3265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3331",
+   "self_type" : "type-3330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3385",
+   "self_type" : "type-3384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15784,6 +24606,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
+   "name" : "android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-3807",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "referenced_type" : "type-807",
@@ -15874,6 +24705,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput *",
+   "name" : "android::hardware::TextOutput *",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-3884",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
+   "name" : "android::hardware::TextOutput::Bundle *",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TypeCode *",
+   "name" : "android::hardware::TypeCode *",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2481",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
    "referenced_type" : "type-1514",
@@ -15885,8 +24752,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2558",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2711",
+   "self_type" : "type-2710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
+   "name" : "android::hardware::details::ClientCounterCallback *",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15966,8 +24842,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-2907",
+   "self_type" : "type-2906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16173,8 +25058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16378,6 +25263,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Thread> *",
+   "name" : "android::sp<android::Thread> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-3821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
    "referenced_type" : "type-472",
@@ -16387,6 +25299,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2502",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> *",
    "name" : "android::sp<android::hardware::HidlMemory> *",
    "referenced_type" : "type-157",
@@ -16540,6 +25461,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
+   "name" : "android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-361",
@@ -16567,6 +25497,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2431",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-3777",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-48",
@@ -16585,6 +25533,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3834",
+   "self_type" : "type-3836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
    "referenced_type" : "type-333",
@@ -16603,6 +25569,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2408",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
    "referenced_type" : "type-348",
@@ -16621,6 +25605,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase *> *",
+   "name" : "const android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
    "referenced_type" : "type-254",
@@ -16630,6 +25632,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-3622",
+   "self_type" : "type-3623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-2513",
+   "self_type" : "type-2514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
    "referenced_type" : "type-249",
@@ -16639,6 +25686,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BHwBinder *",
+   "name" : "const android::hardware::BHwBinder *",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2361",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder *",
+   "name" : "const android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2372",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
+   "name" : "const android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2425",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2370",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
+   "name" : "const android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2509",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "referenced_type" : "type-1051",
@@ -16684,6 +25785,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump *",
+   "name" : "const android::hardware::HexDump *",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
    "referenced_type" : "type-1443",
@@ -16695,8 +25805,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-2477",
-   "self_type" : "type-2479",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2331",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-2641",
+   "self_type" : "type-2643",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16711,6 +25839,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
+   "name" : "const android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IInterface *",
+   "name" : "const android::hardware::IInterface *",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IPCThreadState *",
+   "name" : "const android::hardware::IPCThreadState *",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3639",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel *",
+   "name" : "const android::hardware::Parcel *",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState *",
+   "name" : "const android::hardware::ProcessState *",
+   "referenced_type" : "type-3844",
+   "self_type" : "type-3845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
+   "name" : "const android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-3810",
+   "self_type" : "type-3811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "referenced_type" : "type-811",
@@ -16792,10 +25974,28 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode *",
+   "name" : "const android::hardware::TypeCode *",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-2916",
+   "self_type" : "type-2918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16875,8 +26075,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16920,8 +26120,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17089,6 +26289,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3804",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::Thread> *",
+   "name" : "const android::sp<android::Thread> *",
+   "referenced_type" : "type-3828",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
+   "name" : "const android::sp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory> *",
    "name" : "const android::sp<android::hardware::HidlMemory> *",
    "referenced_type" : "type-162",
@@ -17098,6 +26343,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
    "referenced_type" : "type-70",
@@ -17107,6 +26361,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
+   "name" : "const android::sp<android::hardware::IInterface> *",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
    "referenced_type" : "type-496",
@@ -17215,6 +26478,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
+   "name" : "const android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-464",
@@ -17233,6 +26514,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const binder_buffer_object *",
+   "name" : "const binder_buffer_object *",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3785",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
    "referenced_type" : "type-100",
@@ -17262,17 +26552,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2111",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const dirent *",
-   "name" : "const dirent *",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17287,6 +26568,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3218",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object *",
+   "name" : "const flat_binder_object *",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
    "referenced_type" : "type-624",
@@ -17314,6 +26622,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const native_handle **",
+   "name" : "const native_handle **",
+   "referenced_type" : "type-16",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
    "referenced_type" : "type-604",
@@ -17323,6 +26640,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *",
+   "name" : "const unsigned int *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-2352",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
    "referenced_type" : "type-138",
@@ -17332,6 +26658,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void **",
+   "name" : "const void **",
+   "referenced_type" : "type-139",
+   "self_type" : "type-3781",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "double *",
+   "name" : "double *",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3776",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "float *",
+   "name" : "float *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
    "referenced_type" : "type-303",
@@ -17359,6 +26712,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long *",
+   "name" : "long long *",
+   "referenced_type" : "type-447",
+   "self_type" : "type-3773",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-18",
@@ -17368,6 +26730,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "short *",
+   "name" : "short *",
+   "referenced_type" : "type-2",
+   "self_type" : "type-3771",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-3770",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2492",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "referenced_type" : "type-1251",
@@ -17379,17 +26777,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2096",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17404,6 +26793,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-199",
@@ -17422,6 +26829,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "unsigned long long *",
+   "name" : "unsigned long long *",
+   "referenced_type" : "type-21",
+   "self_type" : "type-3774",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short *",
+   "name" : "unsigned short *",
+   "referenced_type" : "type-132",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2350",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(const void *, void *, void *)",
+   "name" : "void (*)(const void *, void *, void *)",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const char *)",
+   "name" : "void (*)(void *, const char *)",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2540",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
    "referenced_type" : "type-106",
@@ -17444,6 +26896,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase *const",
+   "name" : "android::RefBase *const",
+   "referenced_type" : "type-68",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-1099",
@@ -17516,8 +26978,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17526,8 +26988,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17536,8 +26998,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1730",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17546,8 +27008,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17556,8 +27018,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17566,8 +27028,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17576,8 +27038,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2052",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17586,8 +27048,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17596,8 +27058,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17606,8 +27068,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17616,8 +27078,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17626,8 +27088,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17636,8 +27098,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17646,8 +27108,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17656,8 +27118,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2498",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17666,8 +27128,48 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2719",
+   "self_type" : "type-2721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17686,6 +27188,76 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2870",
+   "self_type" : "type-2872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2936",
+   "self_type" : "type-2938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3008",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3077",
+   "self_type" : "type-3079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3157",
+   "self_type" : "type-3159",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-320",
    "self_type" : "type-322",
    "size" : 4,
@@ -17696,6 +27268,186 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3224",
+   "self_type" : "type-3226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3277",
+   "self_type" : "type-3279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3340",
+   "self_type" : "type-3342",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3430",
+   "self_type" : "type-3432",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3619",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3753",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3891",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3999",
+   "self_type" : "type-4001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-510",
    "self_type" : "type-513",
    "size" : 4,
@@ -17794,6 +27546,316 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_type *const",
+   "name" : "android::RefBase::weakref_type *const",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::BHwBinder *const",
+   "name" : "android::hardware::BHwBinder *const",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-3605",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2365",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "char *const",
+   "name" : "char *const",
+   "referenced_type" : "type-243",
+   "self_type" : "type-3788",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[10]",
+   "name" : "char const[10]",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[11]",
+   "name" : "char const[11]",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[12]",
+   "name" : "char const[12]",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[13]",
+   "name" : "char const[13]",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3646",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[14]",
+   "name" : "char const[14]",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[15]",
+   "name" : "char const[15]",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[16]",
+   "name" : "char const[16]",
+   "referenced_type" : "type-47",
+   "self_type" : "type-3679",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[17]",
+   "name" : "char const[17]",
+   "referenced_type" : "type-3699",
+   "self_type" : "type-3698",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[18]",
+   "name" : "char const[18]",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[19]",
+   "name" : "char const[19]",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[20]",
+   "name" : "char const[20]",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[22]",
+   "name" : "char const[22]",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[25]",
+   "name" : "char const[25]",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[28]",
+   "name" : "char const[28]",
+   "referenced_type" : "type-3730",
+   "self_type" : "type-3729",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[29]",
+   "name" : "char const[29]",
+   "referenced_type" : "type-3705",
+   "self_type" : "type-3704",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[2]",
+   "name" : "char const[2]",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[31]",
+   "name" : "char const[31]",
+   "referenced_type" : "type-3690",
+   "self_type" : "type-3689",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[32]",
+   "name" : "char const[32]",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[35]",
+   "name" : "char const[35]",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[37]",
+   "name" : "char const[37]",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[3]",
+   "name" : "char const[3]",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3669",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[4]",
+   "name" : "char const[4]",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[5]",
+   "name" : "char const[5]",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3796",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[6]",
+   "name" : "char const[6]",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[7]",
+   "name" : "char const[7]",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3685",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[8]",
+   "name" : "char const[8]",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3673",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[9]",
+   "name" : "char const[9]",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::CallStack",
    "name" : "const android::CallStack",
    "referenced_type" : "type-256",
@@ -17804,6 +27866,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-433",
+   "self_type" : "type-3834",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2417",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
    "referenced_type" : "type-315",
@@ -17824,6 +27906,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3825",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2407",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
    "referenced_type" : "type-342",
@@ -17844,6 +27946,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase *>",
+   "name" : "const android::Vector<android::RefBase *>",
+   "referenced_type" : "type-432",
+   "self_type" : "type-3630",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
+   "name" : "const android::Vector<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-431",
+   "self_type" : "type-3626",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
    "referenced_type" : "type-252",
@@ -17854,6 +27976,56 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
+   "name" : "const android::Vector<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-430",
+   "self_type" : "type-3622",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2412",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-428",
+   "self_type" : "type-3829",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2518",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<int>",
+   "name" : "const android::Vector<int>",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2513",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-244",
@@ -17864,6 +28036,76 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BHwBinder",
+   "name" : "const android::hardware::BHwBinder",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2360",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder",
+   "name" : "const android::hardware::BpHwBinder",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2371",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
+   "name" : "const android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2390",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2424",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2397",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2369",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput",
+   "name" : "const android::hardware::BufferedTextOutput",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2508",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "referenced_type" : "type-29",
@@ -17914,6 +28156,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::HexDump",
+   "name" : "const android::hardware::HexDump",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2487",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
    "referenced_type" : "type-1444",
@@ -17926,8 +28178,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-2478",
-   "self_type" : "type-2477",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2330",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2641",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-3985",
+   "self_type" : "type-3984",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17944,6 +28216,36 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
+   "name" : "const android::hardware::IBinder::DeathRecipient",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2419",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IInterface",
+   "name" : "const android::hardware::IInterface",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2550",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IPCThreadState",
+   "name" : "const android::hardware::IPCThreadState",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-3637",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
    "referenced_type" : "type-1039",
@@ -18006,8 +28308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1964",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18016,8 +28318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -18026,8 +28328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -18036,8 +28338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -18046,8 +28348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18056,8 +28358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -18066,8 +28368,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2353",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2569",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18076,6 +28388,66 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3103",
+   "self_type" : "type-3102",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3308",
+   "self_type" : "type-3307",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3353",
+   "self_type" : "type-3352",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3409",
+   "self_type" : "type-3408",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
    "referenced_type" : "type-369",
    "self_type" : "type-368",
    "size" : 68,
@@ -18084,6 +28456,36 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState",
+   "name" : "const android::hardware::ProcessState",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-3844",
+   "size" : 128,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
+   "name" : "const android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-3810",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "referenced_type" : "type-807",
@@ -18184,6 +28586,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::TypeCode",
+   "name" : "const android::hardware::TypeCode",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2482",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
    "referenced_type" : "type-37",
@@ -18196,8 +28608,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1771",
+   "size" : 52,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::Waiter",
+   "name" : "const android::hardware::details::Waiter",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18287,7 +28709,7 @@
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32>",
    "name" : "const android::hardware::hidl_array<unsigned char, 32>",
    "referenced_type" : "type-1012",
-   "self_type" : "type-2292",
+   "self_type" : "type-2268",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18337,7 +28759,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "referenced_type" : "type-1008",
-   "self_type" : "type-2293",
+   "self_type" : "type-2270",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18564,6 +28986,56 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3804",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::Thread>",
+   "name" : "const android::sp<android::Thread>",
+   "referenced_type" : "type-499",
+   "self_type" : "type-3828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
+   "name" : "const android::sp<android::hardware::BHwBinder>",
+   "referenced_type" : "type-472",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
    "name" : "const android::sp<android::hardware::HidlMemory>",
    "referenced_type" : "type-157",
@@ -18572,6 +29044,64 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-962",
+   "self_type" : "type-2404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2522",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-2537",
+   "self_type" : "type-2536",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
@@ -18584,6 +29114,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
+   "name" : "const android::sp<android::hardware::IInterface>",
+   "referenced_type" : "type-968",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "referenced_type" : "type-766",
@@ -18712,6 +29252,16 @@
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-944",
+   "self_type" : "type-2358",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
@@ -18720,11 +29270,21 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-3749",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -18736,6 +29296,14 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3910",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient>",
@@ -18756,6 +29324,16 @@
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const binder_buffer_object",
+   "name" : "const binder_buffer_object",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3783",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
@@ -18776,6 +29354,16 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const char *const",
+   "name" : "const char *const",
+   "referenced_type" : "type-99",
+   "self_type" : "type-2476",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
@@ -18800,18 +29388,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
-   "size" : 280,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const dirent",
-   "name" : "const dirent",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18828,6 +29406,26 @@
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-3210",
+   "self_type" : "type-3209",
+   "size" : 280,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3324",
+   "size" : 280,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-4",
@@ -18838,6 +29436,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const flat_binder_object",
+   "name" : "const flat_binder_object",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-298",
@@ -18939,128 +29547,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1732",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2024",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2175",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2214",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2654",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2497",
-   "self_type" : "type-2496",
+   "referenced_type" : "type-2725",
+   "self_type" : "type-2724",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2572",
-   "self_type" : "type-2571",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2836",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2874",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2933",
+   "self_type" : "type-2932",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3009",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3160",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3228",
+   "self_type" : "type-3227",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3282",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19075,6 +29747,62 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3332",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3390",
+   "self_type" : "type-3389",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3434",
+   "self_type" : "type-3433",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4076",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
    "referenced_type" : "type-516",
    "self_type" : "type-515",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -19270,8 +29998,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1698",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19280,8 +30008,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1737",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19290,8 +30018,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19300,8 +30028,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19310,8 +30038,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19320,8 +30048,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19330,8 +30058,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19340,8 +30068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2148",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19350,8 +30078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19360,8 +30088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19370,28 +30098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2295",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2332",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19410,8 +30118,138 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2505",
-   "self_type" : "type-2504",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2557",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2734",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2804",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3013",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3101",
+   "self_type" : "type-3100",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3290",
+   "self_type" : "type-3289",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19430,6 +30268,36 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3900",
+   "self_type" : "type-3899",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4010",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "referenced_type" : "type-528",
    "self_type" : "type-527",
    "size" : 12,
@@ -19560,8 +30428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1750",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19570,8 +30438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19580,8 +30448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19590,8 +30458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19600,8 +30468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19610,8 +30478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2141",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19620,8 +30488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19630,8 +30498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19640,8 +30508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19650,8 +30518,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2527",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-2858",
+   "self_type" : "type-2857",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-2971",
+   "self_type" : "type-2970",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3023",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3128",
+   "self_type" : "type-3127",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3181",
+   "self_type" : "type-3180",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3248",
+   "self_type" : "type-3247",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3305",
+   "self_type" : "type-3304",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3373",
+   "self_type" : "type-3372",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-4033",
+   "self_type" : "type-4032",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19770,8 +30738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1711",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19780,8 +30748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19790,8 +30758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19800,8 +30768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2019",
-   "self_type" : "type-2018",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19810,8 +30778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19820,8 +30788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19830,8 +30798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19840,8 +30808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19850,8 +30818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19860,8 +30828,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2680",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2856",
+   "self_type" : "type-2855",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2969",
+   "self_type" : "type-2968",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3021",
+   "self_type" : "type-3020",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3246",
+   "self_type" : "type-3245",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3370",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-4031",
+   "self_type" : "type-4030",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -20020,18 +31088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1706",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20040,8 +31098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -20050,8 +31108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20060,8 +31118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20070,8 +31128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20090,18 +31148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20110,8 +31158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20120,18 +31168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2229",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20140,8 +31178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -20150,8 +31188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2597",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20160,8 +31198,158 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2508",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2664",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2960",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3111",
+   "self_type" : "type-3110",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3151",
+   "self_type" : "type-3150",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3169",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3189",
+   "self_type" : "type-3188",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3291",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3301",
+   "self_type" : "type-3300",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3401",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4015",
+   "self_type" : "type-4014",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -20230,8 +31418,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-2738",
+   "self_type" : "type-2737",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20260,8 +31458,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2593",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
+   "name" : "const std::function<sp<IBinder> (void *)>",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20300,8 +31508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -20310,8 +31518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -20330,12 +31538,42 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
    "referenced_type" : "type-377",
    "self_type" : "type-376",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
@@ -20390,8 +31628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20400,8 +31638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2029",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20410,8 +31648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2125",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20420,8 +31658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2146",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20430,8 +31668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20440,8 +31678,68 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3166",
+   "self_type" : "type-3165",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3349",
+   "self_type" : "type-3348",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20500,8 +31798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20510,8 +31808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2057",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2027",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20520,8 +31818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20530,8 +31828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20540,8 +31838,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20550,18 +31848,98 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3086",
+   "self_type" : "type-3085",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3164",
+   "self_type" : "type-3163",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3286",
+   "self_type" : "type-3285",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3346",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> >",
+   "name" : "const std::vector<int, std::allocator<int> >",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2948",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20690,8 +32068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20700,8 +32078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1741",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20710,8 +32088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20720,8 +32098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20730,8 +32108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20740,8 +32118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20750,8 +32128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20760,8 +32138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20780,18 +32158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20810,8 +32178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20830,8 +32198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2243",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20840,8 +32208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20850,8 +32218,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20860,8 +32228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2583",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20870,8 +32238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2689",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20880,8 +32248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2753",
+   "self_type" : "type-2752",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20890,8 +32258,168 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2993",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3005",
+   "self_type" : "type-3004",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3026",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3198",
+   "self_type" : "type-3197",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3314",
+   "self_type" : "type-3313",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3368",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3405",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3426",
+   "self_type" : "type-3425",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3440",
+   "self_type" : "type-3439",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20910,6 +32438,26 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3927",
+   "self_type" : "type-3926",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "referenced_type" : "type-569",
    "self_type" : "type-568",
    "size" : 12,
@@ -21008,6 +32556,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned char *const",
+   "name" : "const unsigned char *const",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-3725",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-1",
@@ -21016,6 +32574,16 @@
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int *const",
+   "name" : "const unsigned int *const",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-3727",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
@@ -21044,6 +32612,26 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const void *const",
+   "name" : "const void *const",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "void *const",
+   "name" : "void *const",
+   "referenced_type" : "type-245",
+   "self_type" : "type-3667",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 1,
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
@@ -21052,12 +32640,75 @@
    "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-19",
+   "self_type" : "type-2337",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
   }
  ],
  "record_types" :
  [
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-9"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-2502"
+    },
+    {
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-2503"
+    }
+   ],
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2501",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -21086,6 +32737,16 @@
    "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::CompileTimeAssert<true>",
+   "name" : "android::CompileTimeAssert<true>",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3802",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Debug.h",
+   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -21130,6 +32791,26 @@
    [
     {
      "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2342"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "field_name" : "mCount",
      "referenced_type" : "type-314"
     }
@@ -21470,6 +33151,64 @@
    "base_specifiers" :
    [
     {
+     "access" : "private",
+     "referenced_type" : "type-251"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2343" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "type-244"
     }
    ],
@@ -21949,6 +33688,61 @@
      "referenced_type" : "type-244"
     }
    ],
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2373" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
@@ -21997,6 +33791,116 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2468" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
+   "linker_set_key" : "android::Vector<int>",
+   "name" : "android::Vector<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android6VectorIiEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -22111,6 +34015,617 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3869",
+   "self_type" : "type-3869",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342", "type-71" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-2334"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 64,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlive",
+     "field_offset" : 96,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObitsSent",
+     "field_offset" : 128,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObituaries",
+     "field_offset" : 160,
+     "referenced_type" : "type-2338"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 192,
+     "referenced_type" : "type-2340"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mConstantData",
+     "field_offset" : 352,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDescriptorCache",
+     "field_offset" : 384,
+     "referenced_type" : "type-342"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder",
+   "name" : "android::hardware::BpHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 52,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "recipient",
+     "referenced_type" : "type-944"
+    },
+    {
+     "field_name" : "cookie",
+     "field_offset" : 64,
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 96,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
+   "name" : "android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2373",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "referenced_type" : "type-2341"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
+   "name" : "android::hardware::BpHwBinder::ObjectManager",
+   "record_kind" : "class",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "object",
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "cleanupCookie",
+     "field_offset" : 32,
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "func",
+     "field_offset" : 64,
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2344",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-2365"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-35"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-2367"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2364",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2472"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mFlags",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSeq",
+     "field_offset" : 64,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIndex",
+     "field_offset" : 96,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mGlobalState",
+     "field_offset" : 160,
+     "referenced_type" : "type-2469"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BufferedTextOutput",
+   "name" : "android::hardware::BufferedTextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2504",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
+    }
+   ]
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -22273,6 +34788,55 @@
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-139"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBytesPerLine",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSingleLineCutoff",
+     "field_offset" : 96,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlignment",
+     "field_offset" : 128,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCArrayStyle",
+     "field_offset" : 160,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::HexDump",
+   "name" : "android::hardware::HexDump",
+   "record_kind" : "class",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
@@ -22366,6 +34930,426 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2378",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2374",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-496"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-430"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-431"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-432"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-431"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-2348"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-2348"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-99"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-472"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-2435"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-2436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-2432"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -22422,6 +35406,373 @@
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-2349"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-291"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-1041"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-2350"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2375",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-245"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-2439"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-2440"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-447"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-428"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-2431"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-245"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-433"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-221"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 808,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 864,
+     "referenced_type" : "type-246"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 896,
+     "referenced_type" : "type-2432"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
+   "size" : 128,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 116,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2329"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-35"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -22687,6 +36038,89 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput",
+   "name" : "android::hardware::TextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTO",
+     "referenced_type" : "type-2474"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TextOutput::Bundle",
+   "name" : "android::hardware::TextOutput::Bundle",
+   "record_kind" : "class",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCode",
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TypeCode",
+   "name" : "android::hardware::TypeCode",
+   "record_kind" : "class",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2480",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -24241,8 +37675,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE",
@@ -27917,6 +41351,52 @@
    "fields" :
    [
     {
+     "field_name" : "key",
+     "referenced_type" : "type-342"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-71"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3805",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342", "type-71" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "key",
+     "referenced_type" : "type-139"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-2344"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "m_ptr",
      "referenced_type" : "type-500"
@@ -27959,6 +41439,26 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
+     "referenced_type" : "type-2469"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2471" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
      "referenced_type" : "type-158"
     }
    ],
@@ -28274,6 +41774,270 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
+   "name" : "android::trait_pointer<android::RefBase *>",
+   "referenced_type" : "type-3744",
+   "self_type" : "type-3744",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3743",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::String16>",
+   "name" : "android::trait_pointer<android::String16>",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3863",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3742",
+   "self_type" : "type-3742",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2461",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2373" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2460",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3861",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2415" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3862",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3805" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2458",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2383" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2528",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2468" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3864",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<const void *>",
+   "name" : "android::trait_pointer<const void *>",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<int>",
+   "name" : "android::trait_pointer<int>",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3882",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
+   "name" : "android::trait_trivial_copy<android::RefBase *>",
+   "referenced_type" : "type-3738",
+   "self_type" : "type-3738",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3737",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
+   "name" : "android::trait_trivial_copy<android::String16>",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3855",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3734",
+   "self_type" : "type-3734",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2373" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3854",
+   "self_type" : "type-3854",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2415" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3857",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3805" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2468" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3856",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
    "referenced_type" : "type-191",
@@ -28296,6 +42060,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<const void *>",
+   "name" : "android::trait_trivial_copy<const void *>",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
    "referenced_type" : "type-529",
@@ -28428,6 +42203,127 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase *>",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3681",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3671",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
+   "name" : "android::trait_trivial_ctor<android::String16>",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3848",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3660",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2445",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2373" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3846",
+   "self_type" : "type-3846",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2415" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3847",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3805" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2467",
+   "self_type" : "type-2467",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2468" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3849",
+   "self_type" : "type-3849",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
    "referenced_type" : "type-189",
@@ -28450,6 +42346,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
+   "name" : "android::trait_trivial_ctor<const void *>",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
    "referenced_type" : "type-522",
@@ -28582,6 +42489,127 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase *>",
+   "referenced_type" : "type-3732",
+   "self_type" : "type-3732",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3724",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
+   "name" : "android::trait_trivial_dtor<android::String16>",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3851",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3713",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2449",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2373" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3850",
+   "self_type" : "type-3850",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2415" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3853",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3805" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2525",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2468" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3852",
+   "self_type" : "type-3852",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
    "referenced_type" : "type-190",
@@ -28604,6 +42632,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
+   "name" : "android::trait_trivial_dtor<const void *>",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
    "referenced_type" : "type-526",
@@ -28736,6 +42775,28 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
+   "name" : "android::trait_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3741",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3740",
+   "self_type" : "type-3740",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
    "referenced_type" : "type-353",
@@ -28758,6 +42819,94 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3739",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2373" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3858",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2415" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3860",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3805" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2527",
+   "self_type" : "type-2527",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2468" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3859",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
    "referenced_type" : "type-192",
@@ -28780,6 +42929,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<const void *>",
+   "name" : "android::trait_trivial_move<const void *>",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
    "referenced_type" : "type-536",
@@ -28911,6 +43071,302 @@
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase *>",
+   "name" : "android::traits<android::RefBase *>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3747",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
+   "name" : "android::traits<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3746",
+   "self_type" : "type-3746",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::String16>",
+   "name" : "android::traits<android::String16>",
+   "referenced_type" : "type-3867",
+   "self_type" : "type-3867",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
+   "name" : "android::traits<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3745",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2373" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2464",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3865",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2415" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3866",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3805" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2383" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2468" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3868",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<const void *>",
+   "name" : "android::traits<const void *>",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android6traitsIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<int>",
+   "name" : "android::traits<int>",
+   "referenced_type" : "type-3883",
+   "self_type" : "type-3883",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android6traitsIiEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3616"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
+   "name" : "android::use_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3615",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3614"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3613",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3612"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3611",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2395"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2394",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2373" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3814"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3813",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2415" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3816"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3815",
+   "self_type" : "type-3815",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3805" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2393"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2383" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2531"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2530",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2468" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3871"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<int>",
+   "name" : "android::use_trivial_move<int>",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3870",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -28969,6 +43425,32 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
+     "referenced_type" : "type-2329"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-35"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::hardware::IBinder>",
+   "name" : "android::wp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2381",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-2328" ],
+   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
      "referenced_type" : "type-143"
     },
     {
@@ -29569,6 +44051,33 @@
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lock",
+     "referenced_type" : "type-2511"
+    },
+    {
+     "field_name" : "has_tls",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "tls",
+     "field_offset" : 64,
+     "referenced_type" : "type-19"
+    }
+   ],
+   "linker_set_key" : "thread_store_t",
+   "name" : "thread_store_t",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2510",
+   "size" : 12,
+   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
+   "unique_id" : "thread_store_t"
   }
  ],
  "rvalue_reference_types" :
@@ -29746,6 +44255,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-962",
+   "self_type" : "type-2421",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
    "referenced_type" : "type-71",
@@ -29901,8 +44419,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29910,8 +44428,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29919,8 +44437,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29928,8 +44446,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29937,8 +44455,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29946,8 +44464,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2285",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3118",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3172",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3240",
+   "self_type" : "type-3239",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3362",
+   "self_type" : "type-3361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30000,8 +44572,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30009,8 +44581,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30018,8 +44590,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30027,8 +44599,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30036,8 +44608,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30045,8 +44617,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2289",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3244",
+   "self_type" : "type-3243",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3366",
+   "self_type" : "type-3365",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30099,8 +44725,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2013",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30108,8 +44734,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2040",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30117,8 +44743,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30126,8 +44752,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30135,8 +44761,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30144,8 +44770,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2287",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3121",
+   "self_type" : "type-3120",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3175",
+   "self_type" : "type-3174",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3242",
+   "self_type" : "type-3241",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3364",
+   "self_type" : "type-3363",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/29/32/arm_armv7-a-neon/source-based/libhwbinder.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libhwbinder.so.lsdump
index 0dfdfd4..e1938ec 100644
--- a/29/32/arm_armv7-a-neon/source-based/libhwbinder.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libhwbinder.so.lsdump
@@ -1,291 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-190",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [10]",
-   "name" : "char [10]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-647",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [11]",
-   "name" : "char [11]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-669",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [12]",
-   "name" : "char [12]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-644",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [13]",
-   "name" : "char [13]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-640",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [14]",
-   "name" : "char [14]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-688",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [15]",
-   "name" : "char [15]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-121",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-672",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [17]",
-   "name" : "char [17]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-691",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [18]",
-   "name" : "char [18]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-676",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [19]",
-   "name" : "char [19]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-707",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [20]",
-   "name" : "char [20]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-685",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [22]",
-   "name" : "char [22]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-710",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [25]",
-   "name" : "char [25]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-700",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [28]",
-   "name" : "char [28]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-722",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [29]",
-   "name" : "char [29]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-697",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [2]",
-   "name" : "char [2]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-650",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [31]",
-   "name" : "char [31]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-682",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-713",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [35]",
-   "name" : "char [35]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-703",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [37]",
-   "name" : "char [37]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-694",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [3]",
-   "name" : "char [3]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-662",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4]",
-   "name" : "char [4]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [5]",
-   "name" : "char [5]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-124",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [6]",
-   "name" : "char [6]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-654",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [7]",
-   "name" : "char [7]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-679",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [8]",
-   "name" : "char [8]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-666",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [9]",
-   "name" : "char [9]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-657",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-94",
-   "self_type" : "type-301",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-81",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-65",
-   "self_type" : "type-241",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-4",
-   "self_type" : "type-292",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -294,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1
   },
   {
@@ -304,43 +18,25 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 1
   },
   {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char16_t",
-   "name" : "char16_t",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 2
-  },
-  {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 8
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-7",
+   "self_type" : "type-7",
    "size" : 4
   },
   {
@@ -348,16 +44,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 8
   },
   {
@@ -365,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 8
   },
   {
@@ -374,27 +70,18 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 2
   },
   {
    "alignment" : 1,
    "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 1
   },
   {
@@ -403,8 +90,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4
   },
   {
@@ -413,8 +100,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -423,8 +110,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 8
   },
   {
@@ -433,16873 +120,46 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+   "name" : "__aeabi_memclr"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "__aeabi_memclr4"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+   "name" : "__aeabi_memclr8"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+   "name" : "__aeabi_memset"
   },
   {
-   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+   "name" : "__aeabi_memset4"
   },
   {
-   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKjjPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKjjPFvPS1_S3_jS5_jPvES7_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel6removeEjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8growDataEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9initStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4dataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
-  },
-  {
-   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "getHWBinderKernelReferences"
-  },
-  {
-   "name" : "printHexData"
-  },
-  {
-   "name" : "printTypeCode"
-  },
-  {
-   "name" : "stringForIndent"
+   "name" : "__aeabi_memset8"
   }
  ],
- "elf_objects" :
- [
-  {
-   "name" : "_ZN7android8hardware12gTextBuffersE"
-  },
-  {
-   "name" : "_ZN7android8hardware13gProcessMutexE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aerrE"
-  },
-  {
-   "name" : "_ZN7android8hardware4alogE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aoutE"
-  },
-  {
-   "name" : "_ZN7android8hardware8gProcessE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10IInterfaceE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware12ProcessStateE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIiEE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10IInterfaceE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware10PoolThreadE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10TextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware12FdTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware12ProcessStateE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware13LogTextOutputE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String16::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String16::StaticLinkage",
-   "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
-   "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-185",
-   "self_type" : "type-185",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    }
-   ],
-   "referenced_type" : "type-512",
-   "return_type" : "type-508",
-   "self_type" : "type-512",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-199"
-    },
-    {
-     "referenced_type" : "type-158"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "referenced_type" : "type-198",
-   "return_type" : "type-37",
-   "self_type" : "type-198",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "referenced_type" : "type-305",
-   "return_type" : "type-19",
-   "self_type" : "type-305",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-520"
-    }
-   ],
-   "referenced_type" : "type-519",
-   "return_type" : "type-520",
-   "self_type" : "type-519",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
-   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "referenced_type" : "type-68",
-   "return_type" : "type-22",
-   "self_type" : "type-68",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (const void *, void *, void *)",
-   "name" : "void (const void *, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "referenced_type" : "type-336",
-   "return_type" : "type-22",
-   "self_type" : "type-336",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-202"
-    }
-   ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-22",
-   "self_type" : "type-575",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-471"
-    },
-    {
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-191",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    },
-    {
-     "referenced_type" : "type-49"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    },
-    {
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-406"
-    },
-    {
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-47",
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-435"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-577",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::sendObituary",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-108"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-111"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-445"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-728"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-745"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-588"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-581"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-584"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-584"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-584"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-584"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-264"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-264"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-264"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-264"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    },
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    },
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
-   "return_type" : "type-192",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMaxThreads",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::startThreadPool",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-199"
-    },
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-192",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-158"
-    },
-    {
-     "referenced_type" : "type-199"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-139",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setCallRestriction",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-205"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getKernelReferences",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::becomeContextManager",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-197"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-201",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-31",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::self",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
-   "return_type" : "type-192",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-193"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKjjPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
-   "return_type" : "type-628",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::clearCaller",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::stopProcess",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setupPolling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::flushCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearLastError",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::executeCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-635"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-466"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-90",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-728"
-    },
-    {
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::self",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
-   "return_type" : "type-628",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::process",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-192",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::shutdown",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::transact",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-728"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::sendReply",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    },
-    {
-     "referenced_type" : "type-728"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-628"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::release_object",
-   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-607"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
-   "return_type" : "type-536",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::print",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "referenced_type" : "type-202"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeFloat",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-94"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-86"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-65"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::finishWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeDouble",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-96"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeObject",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-78"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-746" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-92"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::restartWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeCString",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-202"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInplace",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::writePointer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::continueWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-135"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-199"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-75"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUnpadded",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::acquireObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::freeDataNoInit",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::releaseObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataCapacity",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeWeakBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-43"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeStrongBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKjjPFvPS1_S3_jS5_jPvES7_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-67"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-202"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
-   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::incrementNumReferences",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-82"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-82"
-    },
-    {
-     "referenced_type" : "type-37"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
-   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-82"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::write",
-   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::remove",
-   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::freeData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::growData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setError",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::initState",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBool",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-84"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-516"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-516"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-577",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::onTransact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-728"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-747"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-108"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-111"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-129",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-728"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-748"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "referenced_type" : "type-271"
-    }
-   ],
-   "return_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "return_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-337"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-459"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::isContextManager",
-   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-211"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "return_type" : "type-202",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isServingCall",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-631"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
-   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-540"
-    }
-   ],
-   "return_type" : "type-503",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::clearCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::errorCheck",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::findBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-97"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-95"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-96",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-750" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-87"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-91"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-92",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::scanForFds",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcDataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readCString",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-202",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-102",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::updateCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataCapacity",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::objectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-562"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-134",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcBufferSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-101"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readWeakBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-31",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::quickFindBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::enforceInterface",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-202"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::verifyBufferObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-107"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16Inplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-135",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferChild",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferParent",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-101"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-104"
-    },
-    {
-     "referenced_type" : "type-37"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::data",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::read",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::print",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcData",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::objects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-83"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataAvail",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-94",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-85"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-90",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-64"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::checkSubclass",
-   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-568"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-126"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-154"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::getHWBinderKernelReferences",
-   "linker_set_key" : "getHWBinderKernelReferences",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printHexData",
-   "linker_set_key" : "printHexData",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-37"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-576"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printTypeCode",
-   "linker_set_key" : "printTypeCode",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-576"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::stringForIndent",
-   "linker_set_key" : "stringForIndent",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-202",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "global_vars" :
- [
-  {
-   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
-   "name" : "android::hardware::gTextBuffers",
-   "referenced_type" : "type-543",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
-   "name" : "android::hardware::gProcessMutex",
-   "referenced_type" : "type-312",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aerrE",
-   "name" : "android::hardware::aerr",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4alogE",
-   "name" : "android::hardware::alog",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aoutE",
-   "name" : "android::hardware::aout",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware8gProcessE",
-   "name" : "android::hardware::gProcess",
-   "referenced_type" : "type-751",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  }
- ],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-38",
-   "self_type" : "type-312",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-316",
-   "self_type" : "type-320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const &",
-   "name" : "android::RefBase *const &",
-   "referenced_type" : "type-596",
-   "self_type" : "type-619",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const &",
-   "name" : "android::RefBase::weakref_type *const &",
-   "referenced_type" : "type-594",
-   "self_type" : "type-615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 &",
-   "name" : "android::String16 &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-555",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-201",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const &",
-   "name" : "android::hardware::BHwBinder *const &",
-   "referenced_type" : "type-592",
-   "self_type" : "type-611",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump &",
-   "name" : "android::hardware::HexDump &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-517",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
-   "name" : "android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-140",
-   "self_type" : "type-178",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-265",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-133",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-408",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
-   "name" : "android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-466",
-   "self_type" : "type-625",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-502",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &",
-   "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
-   "name" : "android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
-   "name" : "android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *const &",
-   "name" : "char *const &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[10]",
-   "name" : "char const (&)[10]",
-   "referenced_type" : "type-646",
-   "self_type" : "type-648",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[11]",
-   "name" : "char const (&)[11]",
-   "referenced_type" : "type-668",
-   "self_type" : "type-670",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[12]",
-   "name" : "char const (&)[12]",
-   "referenced_type" : "type-643",
-   "self_type" : "type-645",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[13]",
-   "name" : "char const (&)[13]",
-   "referenced_type" : "type-639",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[14]",
-   "name" : "char const (&)[14]",
-   "referenced_type" : "type-687",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[15]",
-   "name" : "char const (&)[15]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[16]",
-   "name" : "char const (&)[16]",
-   "referenced_type" : "type-671",
-   "self_type" : "type-673",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[17]",
-   "name" : "char const (&)[17]",
-   "referenced_type" : "type-690",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[18]",
-   "name" : "char const (&)[18]",
-   "referenced_type" : "type-675",
-   "self_type" : "type-677",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[19]",
-   "name" : "char const (&)[19]",
-   "referenced_type" : "type-706",
-   "self_type" : "type-708",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[20]",
-   "name" : "char const (&)[20]",
-   "referenced_type" : "type-684",
-   "self_type" : "type-686",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[22]",
-   "name" : "char const (&)[22]",
-   "referenced_type" : "type-709",
-   "self_type" : "type-711",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[25]",
-   "name" : "char const (&)[25]",
-   "referenced_type" : "type-699",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[28]",
-   "name" : "char const (&)[28]",
-   "referenced_type" : "type-721",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[29]",
-   "name" : "char const (&)[29]",
-   "referenced_type" : "type-696",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[2]",
-   "name" : "char const (&)[2]",
-   "referenced_type" : "type-649",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[31]",
-   "name" : "char const (&)[31]",
-   "referenced_type" : "type-681",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[32]",
-   "name" : "char const (&)[32]",
-   "referenced_type" : "type-712",
-   "self_type" : "type-714",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[35]",
-   "name" : "char const (&)[35]",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[37]",
-   "name" : "char const (&)[37]",
-   "referenced_type" : "type-693",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[3]",
-   "name" : "char const (&)[3]",
-   "referenced_type" : "type-661",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[4]",
-   "name" : "char const (&)[4]",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[5]",
-   "name" : "char const (&)[5]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-125",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[6]",
-   "name" : "char const (&)[6]",
-   "referenced_type" : "type-653",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[7]",
-   "name" : "char const (&)[7]",
-   "referenced_type" : "type-678",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[8]",
-   "name" : "char const (&)[8]",
-   "referenced_type" : "type-665",
-   "self_type" : "type-667",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[9]",
-   "name" : "char const (&)[9]",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-199",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-463",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
-   "name" : "const android::hardware::BpHwBinder::Obituary &",
-   "referenced_type" : "type-415",
-   "self_type" : "type-445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "referenced_type" : "type-422",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump &",
-   "name" : "const android::hardware::HexDump &",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-728",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
-   "name" : "const android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-142",
-   "self_type" : "type-179",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode &",
-   "name" : "const android::hardware::TypeCode &",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
-   "name" : "const android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-630",
-   "self_type" : "type-638",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-433",
-   "self_type" : "type-435",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-5",
-   "self_type" : "type-29",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-752",
-   "self_type" : "type-754",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-821",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1090",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1101",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-553",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-572",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-859",
-   "self_type" : "type-861",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-865",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
-   "name" : "const android::sp<android::hardware::IInterface> &",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
-   "name" : "const android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-56",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-30",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char &",
-   "name" : "const char &",
-   "referenced_type" : "type-203",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const &",
-   "name" : "const char *const &",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-350",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-76",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-910",
-   "self_type" : "type-912",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-309",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-247",
-   "self_type" : "type-250",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-399",
-   "self_type" : "type-400",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1158",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-884",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-772",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-907",
-   "self_type" : "type-909",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *const &",
-   "name" : "const unsigned char *const &",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *const &",
-   "name" : "const unsigned int *const &",
-   "referenced_type" : "type-719",
-   "self_type" : "type-720",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-299",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *const &",
-   "name" : "const void *const &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int &",
-   "name" : "int &",
-   "referenced_type" : "type-19",
-   "self_type" : "type-547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1060",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1222",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-812",
-   "self_type" : "type-811",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-976",
-   "self_type" : "type-975",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *const &",
-   "name" : "void *const &",
-   "referenced_type" : "type-659",
-   "self_type" : "type-660",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-729",
-   "self_type" : "type-730",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-733",
-   "self_type" : "type-734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1040",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1149",
-   "self_type" : "type-1148",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-468",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-627",
-   "self_type" : "type-626",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase **",
-   "name" : "android::RefBase **",
-   "referenced_type" : "type-11",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const *",
-   "name" : "android::RefBase *const *",
-   "referenced_type" : "type-596",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1104",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1125",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-245",
-   "self_type" : "type-244",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-579",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-604",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-758",
-   "self_type" : "type-757",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-835",
-   "self_type" : "type-834",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-987",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type **",
-   "name" : "android::RefBase::weakref_type **",
-   "referenced_type" : "type-8",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const *",
-   "name" : "android::RefBase::weakref_type *const *",
-   "referenced_type" : "type-594",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-166",
-   "self_type" : "type-165",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-332",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-201",
-   "self_type" : "type-500",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase *> *",
-   "name" : "android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-447",
-   "self_type" : "type-612",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-620",
-   "self_type" : "type-621",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1110",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1159",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-903",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-548",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-364",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder **",
-   "name" : "android::hardware::BHwBinder **",
-   "referenced_type" : "type-17",
-   "self_type" : "type-589",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const *",
-   "name" : "android::hardware::BHwBinder *const *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-593",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder *",
-   "name" : "android::hardware::BpHwBinder *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-577",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
-   "name" : "android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwRefBase *",
-   "name" : "android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput *",
-   "name" : "android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-535",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-256",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-968",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-856",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump *",
-   "name" : "android::hardware::HexDump *",
-   "referenced_type" : "type-273",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder *",
-   "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-584",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IPCThreadState *",
-   "name" : "android::hardware::IPCThreadState *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState *",
-   "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
-   "name" : "android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "referenced_type" : "type-512",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput *",
-   "name" : "android::hardware::TextOutput *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-264",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
-   "name" : "android::hardware::TextOutput::Bundle *",
-   "referenced_type" : "type-507",
-   "self_type" : "type-509",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TypeCode *",
-   "name" : "android::hardware::TypeCode *",
-   "referenced_type" : "type-269",
-   "self_type" : "type-514",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-141",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-412",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Thread> *",
-   "name" : "android::sp<android::Thread> *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-161",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
-   "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-466",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-454",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> *",
-   "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
-   "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-471",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
-   "name" : "android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-406",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase *> *",
-   "name" : "const android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-613",
-   "self_type" : "type-614",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-610",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-177",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-545",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-260",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BHwBinder *",
-   "name" : "const android::hardware::BHwBinder *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder *",
-   "name" : "const android::hardware::BpHwBinder *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
-   "name" : "const android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-415",
-   "self_type" : "type-416",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwRefBase *",
-   "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
-   "name" : "const android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-539",
-   "self_type" : "type-540",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump *",
-   "name" : "const android::hardware::HexDump *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-518",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
-   "name" : "const android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-452",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IInterface *",
-   "name" : "const android::hardware::IInterface *",
-   "referenced_type" : "type-587",
-   "self_type" : "type-588",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IPCThreadState *",
-   "name" : "const android::hardware::IPCThreadState *",
-   "referenced_type" : "type-629",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel *",
-   "name" : "const android::hardware::Parcel *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState *",
-   "name" : "const android::hardware::ProcessState *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-211",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
-   "name" : "const android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode *",
-   "name" : "const android::hardware::TypeCode *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-515",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-414",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Thread> *",
-   "name" : "const android::sp<android::Thread> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-183",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
-   "name" : "const android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-630",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-433",
-   "self_type" : "type-456",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
-   "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-716",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
-   "name" : "const android::sp<android::hardware::IInterface> *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
-   "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-441",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
-   "name" : "const android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-107",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-794",
-   "self_type" : "type-796",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char16_t *",
-   "name" : "const char16_t *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-100",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-775",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-910",
-   "self_type" : "type-915",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-546",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-247",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-82",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-82",
-   "self_type" : "type-104",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *",
-   "name" : "const unsigned int *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-72",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void **",
-   "name" : "const void **",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double *",
-   "name" : "double *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float *",
-   "name" : "float *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-305",
-   "self_type" : "type-306",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-252",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long *",
-   "name" : "long long *",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "short *",
-   "name" : "short *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "signed char *",
-   "name" : "signed char *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "referenced_type" : "type-519",
-   "self_type" : "type-522",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-914",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-66",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long long *",
-   "name" : "unsigned long long *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned short *",
-   "name" : "unsigned short *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
-   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(const void *, void *, void *)",
-   "name" : "void (*)(const void *, void *, void *)",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-576",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-21",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase *const",
-   "name" : "android::RefBase *const",
-   "referenced_type" : "type-11",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1066",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1104",
-   "self_type" : "type-1106",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1125",
-   "self_type" : "type-1127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-155",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-244",
-   "self_type" : "type-246",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-427",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-44",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-528",
-   "self_type" : "type-530",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-569",
-   "self_type" : "type-571",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-578",
-   "self_type" : "type-580",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-604",
-   "self_type" : "type-606",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-757",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-816",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-834",
-   "self_type" : "type-836",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-853",
-   "self_type" : "type-855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-869",
-   "self_type" : "type-871",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-875",
-   "self_type" : "type-877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-897",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-934",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-963",
-   "self_type" : "type-965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_type *const",
-   "name" : "android::RefBase::weakref_type *const",
-   "referenced_type" : "type-8",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::BHwBinder *const",
-   "name" : "android::hardware::BHwBinder *const",
-   "referenced_type" : "type-17",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::IBinder *const",
-   "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-32",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "char *const",
-   "name" : "char *const",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[10]",
-   "name" : "char const[10]",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[11]",
-   "name" : "char const[11]",
-   "referenced_type" : "type-669",
-   "self_type" : "type-668",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[12]",
-   "name" : "char const[12]",
-   "referenced_type" : "type-644",
-   "self_type" : "type-643",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[13]",
-   "name" : "char const[13]",
-   "referenced_type" : "type-640",
-   "self_type" : "type-639",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[14]",
-   "name" : "char const[14]",
-   "referenced_type" : "type-688",
-   "self_type" : "type-687",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[15]",
-   "name" : "char const[15]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[16]",
-   "name" : "char const[16]",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[17]",
-   "name" : "char const[17]",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[18]",
-   "name" : "char const[18]",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[19]",
-   "name" : "char const[19]",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[20]",
-   "name" : "char const[20]",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[22]",
-   "name" : "char const[22]",
-   "referenced_type" : "type-710",
-   "self_type" : "type-709",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[25]",
-   "name" : "char const[25]",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[28]",
-   "name" : "char const[28]",
-   "referenced_type" : "type-722",
-   "self_type" : "type-721",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[29]",
-   "name" : "char const[29]",
-   "referenced_type" : "type-697",
-   "self_type" : "type-696",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[2]",
-   "name" : "char const[2]",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[31]",
-   "name" : "char const[31]",
-   "referenced_type" : "type-682",
-   "self_type" : "type-681",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[32]",
-   "name" : "char const[32]",
-   "referenced_type" : "type-713",
-   "self_type" : "type-712",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[35]",
-   "name" : "char const[35]",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[37]",
-   "name" : "char const[37]",
-   "referenced_type" : "type-694",
-   "self_type" : "type-693",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[3]",
-   "name" : "char const[3]",
-   "referenced_type" : "type-662",
-   "self_type" : "type-661",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[4]",
-   "name" : "char const[4]",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[5]",
-   "name" : "char const[5]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[6]",
-   "name" : "char const[6]",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[7]",
-   "name" : "char const[7]",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[8]",
-   "name" : "char const[8]",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[9]",
-   "name" : "char const[9]",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-729",
-   "self_type" : "type-731",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-181",
-   "self_type" : "type-182",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-450",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-12",
-   "self_type" : "type-430",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-166",
-   "self_type" : "type-170",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-332",
-   "self_type" : "type-437",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-134",
-   "self_type" : "type-200",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-201",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase *>",
-   "name" : "const android::Vector<android::RefBase *>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-617",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
-   "name" : "const android::Vector<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-613",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-622",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
-   "name" : "const android::Vector<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-609",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-443",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-173",
-   "self_type" : "type-175",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<int>",
-   "name" : "const android::Vector<int>",
-   "referenced_type" : "type-543",
-   "self_type" : "type-544",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-168",
-   "self_type" : "type-257",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BHwBinder",
-   "name" : "const android::hardware::BHwBinder",
-   "referenced_type" : "type-18",
-   "self_type" : "type-118",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder",
-   "name" : "const android::hardware::BpHwBinder",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
-   "name" : "const android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-338",
-   "self_type" : "type-415",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager",
-   "referenced_type" : "type-330",
-   "self_type" : "type-458",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-334",
-   "self_type" : "type-422",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwRefBase",
-   "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-146",
-   "self_type" : "type-160",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput",
-   "name" : "const android::hardware::BufferedTextOutput",
-   "referenced_type" : "type-534",
-   "self_type" : "type-539",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::HexDump",
-   "name" : "const android::hardware::HexDump",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder",
-   "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-23",
-   "self_type" : "type-567",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
-   "name" : "const android::hardware::IBinder::DeathRecipient",
-   "referenced_type" : "type-59",
-   "self_type" : "type-452",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IInterface",
-   "name" : "const android::hardware::IInterface",
-   "referenced_type" : "type-339",
-   "self_type" : "type-587",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IPCThreadState",
-   "name" : "const android::hardware::IPCThreadState",
-   "referenced_type" : "type-464",
-   "self_type" : "type-629",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState",
-   "name" : "const android::hardware::ProcessState",
-   "referenced_type" : "type-194",
-   "self_type" : "type-210",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
-   "name" : "const android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-140",
-   "self_type" : "type-142",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::TypeCode",
-   "name" : "const android::hardware::TypeCode",
-   "referenced_type" : "type-269",
-   "self_type" : "type-268",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-133",
-   "self_type" : "type-132",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Thread>",
-   "name" : "const android::sp<android::Thread>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-174",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
-   "name" : "const android::sp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-630",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "referenced_type" : "type-502",
-   "self_type" : "type-526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1099",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
-   "name" : "const android::sp<android::hardware::IInterface>",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
-   "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-192",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
-   "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-106",
-   "self_type" : "type-105",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-114",
-   "self_type" : "type-203",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-202",
-   "self_type" : "type-510",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const char16_t",
-   "name" : "const char16_t",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-96",
-   "self_type" : "type-350",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-94",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-239",
-   "self_type" : "type-247",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-90",
-   "self_type" : "type-145",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-86",
-   "self_type" : "type-402",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-84",
-   "self_type" : "type-399",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-65",
-   "self_type" : "type-71",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char *const",
-   "name" : "const unsigned char *const",
-   "referenced_type" : "type-70",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-55",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int *const",
-   "name" : "const unsigned int *const",
-   "referenced_type" : "type-72",
-   "self_type" : "type-719",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-92",
-   "self_type" : "type-276",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-88",
-   "self_type" : "type-404",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-22",
-   "self_type" : "type-103",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const void *const",
-   "name" : "const void *const",
-   "referenced_type" : "type-102",
-   "self_type" : "type-410",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-37",
-   "self_type" : "type-42",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile int",
-   "name" : "volatile int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-204",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-425"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "d_",
-     "field_offset" : 32,
-     "referenced_type" : "type-532"
-    },
-    {
-     "access" : "private",
-     "field_name" : "s_",
-     "field_offset" : 64,
-     "referenced_type" : "type-533"
-    }
-   ],
-   "linker_set_key" : "Renamer",
-   "name" : "Renamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
-    },
-    {
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-620"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-131",
-   "self_type" : "type-131",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-134", "type-50" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-332"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-102", "type-334" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-3" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-312"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-317"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-320"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-320"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-13"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-167"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "record_kind" : "class",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-169" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-167"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-333" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-135"
-    }
-   ],
-   "linker_set_key" : "android::String16",
-   "name" : "android::String16",
-   "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "unique_id" : "_ZTSN7android8String16E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-202"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-36"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-21"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-40"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-42"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-42"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-33"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase *>",
-   "name" : "android::Vector<android::RefBase *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
-   "name" : "android::Vector<android::RefBase::weakref_type *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-201" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
-   "name" : "android::Vector<android::hardware::BHwBinder *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-140" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::Vector<int>",
-   "name" : "android::Vector<int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android6VectorIiEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-21"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-55"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-55"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134", "type-50" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102", "type-334" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPolicy",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExtras",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReserved0",
-     "field_offset" : 128,
-     "referenced_type" : "type-21"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BHwBinder",
-   "name" : "android::hardware::BHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlive",
-     "field_offset" : 96,
-     "referenced_type" : "type-204"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObitsSent",
-     "field_offset" : 128,
-     "referenced_type" : "type-204"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObituaries",
-     "field_offset" : 160,
-     "referenced_type" : "type-328"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 192,
-     "referenced_type" : "type-330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mConstantData",
-     "field_offset" : 352,
-     "referenced_type" : "type-69"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDescriptorCache",
-     "field_offset" : 384,
-     "referenced_type" : "type-134"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder",
-   "name" : "android::hardware::BpHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 52,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "recipient",
-     "referenced_type" : "type-57"
-    },
-    {
-     "field_name" : "cookie",
-     "field_offset" : 64,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
-   "name" : "android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "referenced_type" : "type-331"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
-   "name" : "android::hardware::BpHwBinder::ObjectManager",
-   "record_kind" : "class",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "object",
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "cleanupCookie",
-     "field_offset" : 32,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "func",
-     "field_offset" : 64,
-     "referenced_type" : "type-335"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRemote",
-     "field_offset" : 32,
-     "referenced_type" : "type-147"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 96,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwRefBase",
-   "name" : "android::hardware::BpHwRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-265"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSeq",
-     "field_offset" : 64,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 128,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGlobalState",
-     "field_offset" : 160,
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BufferedTextOutput",
-   "name" : "android::hardware::BufferedTextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBytesPerLine",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSingleLineCutoff",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlignment",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCArrayStyle",
-     "field_offset" : 160,
-     "referenced_type" : "type-37"
-    }
-   ],
-   "linker_set_key" : "android::hardware::HexDump",
-   "name" : "android::hardware::HexDump",
-   "record_kind" : "class",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder",
-   "name" : "android::hardware::IBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
-   "name" : "android::hardware::IBinder::DeathRecipient",
-   "record_kind" : "class",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IInterface",
-   "name" : "android::hardware::IInterface",
-   "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mProcess",
-     "referenced_type" : "type-465"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingStrongDerefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-446"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingWeakDerefs",
-     "field_offset" : 192,
-     "referenced_type" : "type-447"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteStrongDerefs",
-     "field_offset" : 352,
-     "referenced_type" : "type-448"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteWeakDerefs",
-     "field_offset" : 512,
-     "referenced_type" : "type-447"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIn",
-     "field_offset" : 672,
-     "referenced_type" : "type-62"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOut",
-     "field_offset" : 1216,
-     "referenced_type" : "type-62"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastError",
-     "field_offset" : 1760,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingPid",
-     "field_offset" : 1792,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingSid",
-     "field_offset" : 1824,
-     "referenced_type" : "type-202"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingUid",
-     "field_offset" : 1856,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStrictModePolicy",
-     "field_offset" : 1888,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastTransactionBinderFlags",
-     "field_offset" : 1920,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContextObject",
-     "field_offset" : 1952,
-     "referenced_type" : "type-466"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsLooper",
-     "field_offset" : 1984,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsPollingThread",
-     "field_offset" : 1992,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostCommandTasks",
-     "field_offset" : 2016,
-     "referenced_type" : "type-467"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIPCThreadStateBase",
-     "field_offset" : 2112,
-     "referenced_type" : "type-468"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 2144,
-     "referenced_type" : "type-205"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IPCThreadState",
-   "name" : "android::hardware::IPCThreadState",
-   "record_kind" : "class",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
-   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBufCachePos",
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufCache",
-     "field_offset" : 32,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mError",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 160,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataCapacity",
-     "field_offset" : 224,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataPos",
-     "field_offset" : 256,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 288,
-     "referenced_type" : "type-66"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsCapacity",
-     "field_offset" : 352,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNextObjectHint",
-     "field_offset" : 384,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumRef",
-     "field_offset" : 416,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFdsKnown",
-     "field_offset" : 448,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHasFds",
-     "field_offset" : 456,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllowFds",
-     "field_offset" : 464,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 480,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnerCookie",
-     "field_offset" : 512,
-     "referenced_type" : "type-21"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel",
-   "name" : "android::hardware::Parcel",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6ParcelE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "index",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "buffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "bufend",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
-   "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDriverFD",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVMStart",
-     "field_offset" : 64,
-     "referenced_type" : "type-21"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-195"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountDecrement",
-     "field_offset" : 128,
-     "referenced_type" : "type-196"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExecutingThreadsCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMaxThreads",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStarvationStartTimeMs",
-     "field_offset" : 256,
-     "referenced_type" : "type-90"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 320,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandleToObject",
-     "field_offset" : 352,
-     "referenced_type" : "type-173"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mManagesContexts",
-     "field_offset" : 512,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextCheckFunc",
-     "field_offset" : 544,
-     "referenced_type" : "type-197"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextUserData",
-     "field_offset" : 576,
-     "referenced_type" : "type-21"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContexts",
-     "field_offset" : 608,
-     "referenced_type" : "type-181"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRootDir",
-     "field_offset" : 768,
-     "referenced_type" : "type-201"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolStarted",
-     "field_offset" : 800,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSpawnThreadOnStart",
-     "field_offset" : 808,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolSeq",
-     "field_offset" : 832,
-     "referenced_type" : "type-204"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMmapSize",
-     "field_offset" : 864,
-     "referenced_type" : "type-55"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 896,
-     "referenced_type" : "type-205"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState",
-   "name" : "android::hardware::ProcessState",
-   "record_kind" : "class",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
-   "size" : 128,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 116,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -116,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -116,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "binder",
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
-   "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput",
-   "name" : "android::hardware::TextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTO",
-     "referenced_type" : "type-508"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TextOutput::Bundle",
-   "name" : "android::hardware::TextOutput::Bundle",
-   "record_kind" : "class",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCode",
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TypeCode",
-   "name" : "android::hardware::TypeCode",
-   "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-134"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-50"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134", "type-50" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-102"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-334"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102", "type-334" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
-   "name" : "android::sp<android::hardware::BHwBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-18" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-505" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-584"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-193"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
-   "name" : "android::sp<android::hardware::ProcessState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-194" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
-   "name" : "android::trait_pointer<android::RefBase *>",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::String16>",
-   "name" : "android::trait_pointer<android::String16>",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-133" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<const void *>",
-   "name" : "android::trait_pointer<const void *>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<int>",
-   "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
-   "name" : "android::trait_trivial_copy<android::RefBase *>",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
-   "name" : "android::trait_trivial_copy<android::String16>",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-133" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<const void *>",
-   "name" : "android::trait_trivial_copy<const void *>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-96" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-94" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-90" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
-   "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
-   "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase *>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
-   "name" : "android::trait_trivial_ctor<android::String16>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-133" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
-   "name" : "android::trait_trivial_ctor<const void *>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-96" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-94" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long long>",
-   "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-90" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-372",
-   "self_type" : "type-372",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
-   "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
-   "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
-   "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase *>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
-   "name" : "android::trait_trivial_dtor<android::String16>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-133" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
-   "name" : "android::trait_trivial_dtor<const void *>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-96" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-94" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long long>",
-   "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-90" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
-   "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
-   "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
-   "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
-   "name" : "android::trait_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String16>",
-   "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-201" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-133" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-349",
-   "self_type" : "type-349",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<const void *>",
-   "name" : "android::trait_trivial_move<const void *>",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-96" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-94" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-90" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned int>",
-   "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long>",
-   "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase *>",
-   "name" : "android::traits<android::RefBase *>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
-   "name" : "android::traits<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::String16>",
-   "name" : "android::traits<android::String16>",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
-   "name" : "android::traits<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-133" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<const void *>",
-   "name" : "android::traits<const void *>",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android6traitsIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<int>",
-   "name" : "android::traits<int>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android6traitsIiEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-603"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
-   "name" : "android::use_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-601"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-599"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-420"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-150"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-140" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-152"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-133" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-418"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-564"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-243"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<int>",
-   "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-58"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-59" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder>",
-   "name" : "android::wp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-94"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-295"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-298"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-64"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-293"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-94"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-94"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-292"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-240"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-241"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-221"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-212"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-189"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-190"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-190"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-190"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-190"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-81"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "lock",
-     "referenced_type" : "type-542"
-    },
-    {
-     "field_name" : "has_tls",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tls",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "thread_store_t",
-   "name" : "thread_store_t",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
-   "unique_id" : "thread_store_t"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "referenced_type" : "type-434",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
-   "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
+ "elf_objects" : [],
+ "enum_types" : [],
+ "function_types" : [],
+ "functions" : [],
+ "global_vars" : [],
+ "lvalue_reference_types" : [],
+ "pointer_types" : [],
+ "qualified_types" : [],
+ "record_types" : [],
+ "rvalue_reference_types" : []
 }
diff --git a/29/32/x86/source-based/libhidlbase.so.lsdump b/29/32/x86/source-based/libhidlbase.so.lsdump
index b903929..9c4e70a 100644
--- a/29/32/x86/source-based/libhidlbase.so.lsdump
+++ b/29/32/x86/source-based/libhidlbase.so.lsdump
@@ -5,40 +5,274 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-664",
+   "referenced_type" : "type-43",
+   "self_type" : "type-175",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "char [10]",
+   "name" : "char [10]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3464",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [11]",
+   "name" : "char [11]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3490",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [12]",
+   "name" : "char [12]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3461",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [13]",
+   "name" : "char [13]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3457",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [14]",
+   "name" : "char [14]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3508",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [15]",
+   "name" : "char [15]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3606",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "type-43",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [17]",
+   "name" : "char [17]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3511",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [18]",
+   "name" : "char [18]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3496",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [19]",
+   "name" : "char [19]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3527",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [20]",
+   "name" : "char [20]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3505",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [22]",
+   "name" : "char [22]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3530",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [25]",
+   "name" : "char [25]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3520",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [28]",
+   "name" : "char [28]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3541",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [29]",
+   "name" : "char [29]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3517",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [2]",
+   "name" : "char [2]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3468",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [31]",
+   "name" : "char [31]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3502",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3533",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [35]",
+   "name" : "char [35]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3523",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [37]",
+   "name" : "char [37]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3514",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [3]",
+   "name" : "char [3]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3481",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4]",
+   "name" : "char [4]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3603",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [5]",
+   "name" : "char [5]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3609",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [6]",
+   "name" : "char [6]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3472",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [7]",
+   "name" : "char [7]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3499",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [8]",
+   "name" : "char [8]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3485",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [9]",
+   "name" : "char [9]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3475",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-237",
+   "self_type" : "type-236",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-435",
+   "referenced_type" : "type-146",
+   "self_type" : "type-973",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46,8 +280,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-670",
+   "referenced_type" : "type-146",
+   "self_type" : "type-181",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -55,8 +289,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-102",
-   "self_type" : "type-713",
+   "referenced_type" : "type-44",
+   "self_type" : "type-227",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +303,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1
   },
   {
@@ -78,8 +312,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1
   },
   {
@@ -88,8 +322,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 2
   },
   {
@@ -104,8 +338,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 4
   },
   {
@@ -113,8 +347,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -122,8 +356,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4
   },
   {
@@ -131,8 +365,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 8
   },
   {
@@ -140,8 +374,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 2
   },
   {
@@ -149,8 +383,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 1
   },
   {
@@ -159,8 +393,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -169,8 +403,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4
   },
   {
@@ -179,8 +413,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4
   },
   {
@@ -189,8 +423,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8
   },
   {
@@ -199,15 +433,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108"
+   "referenced_type" : "type-77",
+   "self_type" : "type-77"
   }
  ],
  "elf_functions" :
@@ -218,10 +452,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
   },
   {
@@ -1173,6 +1423,78 @@
    "name" : "_ZN7android4hidl7manager4V1_218BpHwServiceManagerC2ERKNS_2spINS_8hardware7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE"
   },
   {
@@ -1203,6 +1525,36 @@
    "name" : "_ZN7android8hardware10HidlMemoryD2Ev"
   },
   {
+   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD2Ev"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
@@ -1219,6 +1571,30 @@
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl7manager4V1_215IServiceManagerENS4_18BpHwServiceManagerENS4_18BnHwServiceManagerEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware11hidl_handle10freeHandleEv"
   },
   {
@@ -1330,18 +1706,243 @@
    "name" : "_ZN7android8hardware11hidl_stringaSERKS1_"
   },
   {
+   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_6StatusEPNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKjjPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
    "name" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware14readFromParcelERKNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_"
   },
   {
@@ -1354,9 +1955,45 @@
    "name" : "_ZN7android8hardware16setRequestingSidERKNS_2spINS_4hidl4base4V1_05IBaseEEEb"
   },
   {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android8hardware17joinRpcThreadpoolEv"
   },
   {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE"
   },
   {
@@ -1375,6 +2012,9 @@
    "name" : "_ZN7android8hardware20LazyServiceRegistrarC2Ev"
   },
   {
+   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware21defaultServiceManagerEv"
   },
   {
@@ -1441,6 +2081,184 @@
    "name" : "_ZN7android8hardware31setProcessHidlReturnRestrictionENS0_21HidlReturnRestrictionE"
   },
   {
+   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKjjPFvPS1_S3_jS5_jPvES7_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel6removeEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8growDataEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9initStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware6Status11fromStatusTEi"
   },
   {
@@ -1471,6 +2289,30 @@
    "name" : "_ZN7android8hardware6StatusC2EiiPKc"
   },
   {
+   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE"
   },
   {
@@ -1650,12 +2492,75 @@
    "name" : "_ZN7android8hardware7details25registerAsServiceInternalERKNS_2spINS_4hidl4base4V1_05IBaseEEERKNSt3__112basic_stringIcNSA_11char_traitsIcEENSA_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
+  },
+  {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE"
   },
   {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE"
   },
   {
+   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv"
   },
   {
@@ -1677,12 +2582,259 @@
    "name" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv"
   },
   {
+   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4dataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
+  },
+  {
    "name" : "_ZNK7android8hardware6Status11descriptionEv"
   },
   {
+   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware7details13return_status8assertOkEv"
   },
   {
+   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNKSt3__110__back_refIcE6__execERNS_7__stateIcEE"
   },
@@ -2539,13 +3691,79 @@
    "name" : "_ZTv0_n12_N7android4hidl7manager4V1_218BnHwServiceManagerD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+  },
+  {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD0Ev"
   },
   {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
    "name" : "__udivdi3"
+  },
+  {
+   "name" : "getHWBinderKernelReferences"
+  },
+  {
+   "name" : "printHexData"
+  },
+  {
+   "name" : "printTypeCode"
+  },
+  {
+   "name" : "stringForIndent"
   }
  ],
  "elf_objects" :
@@ -2597,6 +3815,21 @@
    "name" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE"
   },
   {
+   "name" : "_ZN7android8hardware12gTextBuffersE"
+  },
+  {
+   "name" : "_ZN7android8hardware13gProcessMutexE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aerrE"
+  },
+  {
+   "name" : "_ZN7android8hardware4alogE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aoutE"
+  },
+  {
    "name" : "_ZN7android8hardware7details14gServiceSidMapE"
   },
   {
@@ -2612,6 +3845,9 @@
    "name" : "_ZN7android8hardware7details6gBnMapE"
   },
   {
+   "name" : "_ZN7android8hardware8gProcessE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android4hidl4base4V1_06BsBaseE0_NS2_5IBaseE"
   },
@@ -2807,6 +4043,13 @@
    "name" : "_ZTCN7android4hidl7manager4V1_218BpHwServiceManagerE8_NS_8hardware11BpHwRefBaseE"
   },
   {
+   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE0_NS4_5IBaseE"
   },
@@ -2836,6 +4079,9 @@
    "name" : "_ZTCN7android8hardware7details6WaiterE0_NS_4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE0_NS_13basic_istreamIcS2_EE"
   },
@@ -2853,6 +4099,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
   },
   {
@@ -2910,16 +4168,31 @@
    "name" : "_ZTTN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "name" : "_ZTTN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTTN7android8hardware10IInterfaceE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
+   "name" : "_ZTTN7android8hardware12ProcessStateE"
+  },
+  {
    "name" : "_ZTTN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTTN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware7details21ClientCounterCallbackE"
   },
   {
@@ -2927,6 +4200,9 @@
    "name" : "_ZTTN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTTN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE"
   },
@@ -2939,6 +4215,14 @@
    "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
    "name" : "_ZTVN7android4hidl4base4V1_05IBaseE"
   },
   {
@@ -3017,20 +4301,85 @@
    "name" : "_ZTVN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIiEE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTVN7android8hardware10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware10PoolThreadE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10TextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android8hardware12FdTextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware12ProcessStateE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware13LogTextOutputE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android8hardware25PassthroughServiceManagerE"
   },
   {
    "name" : "_ZTVN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTVN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware7details16HidlInstrumentorE"
   },
   {
@@ -3041,6 +4390,9 @@
    "name" : "_ZTVN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTVN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__110__back_refIcEE"
   },
@@ -3126,6 +4478,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -3202,11 +4558,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -3220,11 +4576,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -3238,11 +4594,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -3264,11 +4620,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -3294,11 +4650,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -3316,11 +4672,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-276",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -3329,6 +4685,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-14",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -3370,11 +4752,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -3424,11 +4806,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -3450,11 +4832,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -3468,11 +4850,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -3494,11 +4876,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-182",
+   "underlying_type" : "type-146",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3544,11 +4926,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -3598,11 +4980,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -3624,11 +5006,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -3666,11 +5048,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -3908,11 +5290,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-698",
-   "self_type" : "type-698",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -3938,11 +5320,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -3968,11 +5350,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4010,11 +5392,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-228",
+   "self_type" : "type-228",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_component"
   },
   {
@@ -4048,11 +5430,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_format"
   },
   {
@@ -4074,11 +5456,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-216",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -4092,11 +5474,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-221",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -4122,11 +5504,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-225",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -4216,11 +5598,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-696",
-   "self_type" : "type-696",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -4258,11 +5640,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -4276,11 +5658,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -4306,11 +5688,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -4340,11 +5722,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_transform_t"
   },
   {
@@ -4394,11 +5776,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "log_id"
   }
  ],
@@ -4406,18 +5788,138 @@
  [
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2285"
+    }
+   ],
+   "referenced_type" : "type-2289",
+   "return_type" : "type-2285",
+   "self_type" : "type-2289",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-694"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2240",
+   "return_type" : "type-29",
+   "self_type" : "type-2240",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (void *)",
    "name" : "int (void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     }
    ],
-   "referenced_type" : "type-728",
-   "return_type" : "type-17",
-   "self_type" : "type-728",
+   "referenced_type" : "type-242",
+   "return_type" : "type-14",
+   "self_type" : "type-242",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2301"
+    }
+   ],
+   "referenced_type" : "type-2300",
+   "return_type" : "type-2301",
+   "self_type" : "type-2300",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2163",
+   "return_type" : "type-77",
+   "self_type" : "type-2163",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (const void *, void *, void *)",
+   "name" : "void (const void *, void *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2158",
+   "return_type" : "type-77",
+   "self_type" : "type-2158",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (void *, const char *)",
+   "name" : "void (void *, const char *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "referenced_type" : "type-3395",
+   "return_type" : "type-77",
+   "self_type" : "type-3395",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "functions" :
@@ -4429,10 +5931,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-448"
+    },
+    {
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-3651",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -4442,29 +5960,77 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-743"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-435"
+    },
+    {
+     "referenced_type" : "type-436"
+    }
+   ],
+   "return_type" : "type-438",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-435"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-438",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2192"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-3564",
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::hidl::base::V1_0::IBase::linkToDeath",
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4474,13 +6040,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2118"
+     "referenced_type" : "type-2559"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4490,13 +6056,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2119"
+     "referenced_type" : "type-2560"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4506,13 +6072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4522,13 +6088,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2120"
+     "referenced_type" : "type-2561"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4538,13 +6104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2562"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4554,10 +6120,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4567,10 +6133,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4580,10 +6146,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4593,16 +6159,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4611,14 +6177,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4629,13 +6195,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-2124"
+     "referenced_type" : "type-2565"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4645,13 +6211,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4661,13 +6227,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4676,19 +6242,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2127"
+     "referenced_type" : "type-2568"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4698,27 +6264,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2128"
+     "referenced_type" : "type-2569"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4727,19 +6293,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2570"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4750,13 +6316,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-2130"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4765,19 +6331,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2131"
+     "referenced_type" : "type-2572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4786,19 +6352,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2132"
+     "referenced_type" : "type-2573"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4807,19 +6373,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2133"
+     "referenced_type" : "type-2574"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4828,19 +6394,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2134"
+     "referenced_type" : "type-2575"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4849,19 +6415,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2135"
+     "referenced_type" : "type-2576"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4872,10 +6438,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4885,13 +6451,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4901,19 +6467,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4923,13 +6489,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4939,19 +6505,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4961,10 +6527,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4974,10 +6540,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4987,10 +6553,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4999,13 +6565,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5014,19 +6580,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5036,16 +6602,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5055,13 +6621,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2136"
+     "referenced_type" : "type-2577"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5071,13 +6637,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2137"
+     "referenced_type" : "type-2578"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5087,13 +6653,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5103,13 +6669,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2138"
+     "referenced_type" : "type-2579"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5118,16 +6684,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2139"
+     "referenced_type" : "type-2580"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5136,16 +6702,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2140"
+     "referenced_type" : "type-2581"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5155,13 +6721,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2141"
+     "referenced_type" : "type-2582"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5170,16 +6736,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2142"
+     "referenced_type" : "type-2583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5189,10 +6755,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5202,10 +6768,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5214,16 +6780,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2143"
+     "referenced_type" : "type-2584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5232,13 +6798,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5247,13 +6813,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5263,10 +6829,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5276,16 +6842,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5295,13 +6861,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5311,13 +6877,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5327,14 +6893,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5344,16 +6910,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5363,13 +6929,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5379,13 +6945,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5395,14 +6961,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5412,13 +6978,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5428,13 +6994,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5444,14 +7010,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5461,13 +7027,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1039"
+     "referenced_type" : "type-1418"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5477,10 +7043,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5490,10 +7056,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5502,13 +7068,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5518,10 +7084,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5531,16 +7097,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5549,14 +7115,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5565,14 +7131,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5583,13 +7149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1421"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5599,13 +7165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5615,13 +7181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5630,19 +7196,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1427"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5652,27 +7218,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1428"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5683,13 +7249,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-1050"
+     "referenced_type" : "type-1429"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5698,19 +7264,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-1430"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5719,19 +7285,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1052"
+     "referenced_type" : "type-1431"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5740,19 +7306,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1053"
+     "referenced_type" : "type-1432"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5761,19 +7327,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5782,19 +7348,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5805,10 +7371,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5817,19 +7383,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1435"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5838,19 +7404,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5860,13 +7426,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5876,13 +7442,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5892,10 +7458,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5905,10 +7471,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5918,10 +7484,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5930,16 +7496,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5949,16 +7515,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5968,13 +7534,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1059"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5984,13 +7550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1060"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6000,16 +7566,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6019,13 +7585,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6035,13 +7601,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1440"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6050,16 +7616,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6069,16 +7635,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1063"
+     "referenced_type" : "type-1442"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6087,19 +7653,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6109,13 +7675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1064"
+     "referenced_type" : "type-1443"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6124,19 +7690,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1065"
+     "referenced_type" : "type-1444"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6146,10 +7712,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6159,10 +7725,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6172,19 +7738,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6194,16 +7760,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6212,22 +7778,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6236,19 +7802,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6258,16 +7824,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6277,16 +7843,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6296,13 +7862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1066"
+     "referenced_type" : "type-1445"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6312,10 +7878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6325,16 +7891,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6343,19 +7909,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6364,19 +7930,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6386,13 +7952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1067"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6402,13 +7968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6418,13 +7984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6434,14 +8000,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6451,16 +8017,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6470,13 +8036,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6486,13 +8052,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1069"
+     "referenced_type" : "type-1448"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6502,14 +8068,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6519,13 +8085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6535,13 +8101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1070"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6551,14 +8117,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6568,13 +8134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1071"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6584,10 +8150,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6597,10 +8163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6609,13 +8175,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6625,10 +8191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6638,16 +8204,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6656,14 +8222,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6672,14 +8238,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6690,13 +8256,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1453"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6706,13 +8272,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6722,13 +8288,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6737,19 +8303,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1034"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6758,19 +8324,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1034"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6780,27 +8346,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1088"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1077"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6811,13 +8377,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-1078"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6826,19 +8392,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1088"
     },
     {
-     "referenced_type" : "type-1079"
+     "referenced_type" : "type-1458"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6849,10 +8415,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6862,13 +8428,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6878,13 +8444,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6894,10 +8460,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6907,10 +8473,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6920,10 +8486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6933,16 +8499,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6952,13 +8518,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1080"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6968,13 +8534,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1081"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6984,13 +8550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7000,13 +8566,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1082"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7016,19 +8582,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7038,13 +8604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1083"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7053,22 +8619,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-1049"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7078,10 +8644,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7091,10 +8657,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7104,10 +8670,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7117,16 +8683,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7136,13 +8702,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7152,13 +8718,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7168,14 +8734,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7185,16 +8751,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7204,13 +8770,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1084"
+     "referenced_type" : "type-1463"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7220,13 +8786,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1085"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7236,14 +8802,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7253,13 +8819,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7269,13 +8835,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1086"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7285,14 +8851,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7302,13 +8868,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1087"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7318,10 +8884,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7331,10 +8897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7343,13 +8909,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7359,10 +8925,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7372,16 +8938,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7390,14 +8956,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7406,14 +8972,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7422,14 +8988,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7440,13 +9006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7456,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7472,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7488,27 +9054,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1145"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1146"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1475"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7519,13 +9085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1476"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7534,19 +9100,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1145"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1146"
     },
     {
-     "referenced_type" : "type-1098"
+     "referenced_type" : "type-1477"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7557,10 +9123,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7570,13 +9136,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7586,13 +9152,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7602,10 +9168,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7615,10 +9181,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7628,10 +9194,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7641,16 +9207,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7660,13 +9226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1478"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7676,13 +9242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1479"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7692,16 +9258,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7711,13 +9277,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7727,13 +9293,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1480"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7743,16 +9309,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-1481"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7762,13 +9328,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1482"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7778,10 +9344,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7791,10 +9357,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7804,19 +9370,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7826,16 +9392,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7845,19 +9411,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7866,22 +9432,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-1104"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7891,16 +9457,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7910,16 +9476,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7929,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1483"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7945,10 +9511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7958,16 +9524,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7977,13 +9543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1484"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7993,13 +9559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8009,13 +9575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8025,14 +9591,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8042,16 +9608,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8061,13 +9627,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2144"
+     "referenced_type" : "type-2585"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8077,13 +9643,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2145"
+     "referenced_type" : "type-2586"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8093,14 +9659,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8110,13 +9676,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8126,13 +9692,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2146"
+     "referenced_type" : "type-2587"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8142,14 +9708,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8159,13 +9725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2147"
+     "referenced_type" : "type-2588"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8175,10 +9741,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8188,10 +9754,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8200,13 +9766,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8216,10 +9782,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8229,16 +9795,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8247,14 +9813,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8263,14 +9829,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8280,14 +9846,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8297,16 +9863,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8316,13 +9882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2148"
+     "referenced_type" : "type-2589"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8332,13 +9898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2149"
+     "referenced_type" : "type-2590"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8348,14 +9914,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8365,13 +9931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8381,13 +9947,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2150"
+     "referenced_type" : "type-2591"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8397,14 +9963,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8414,13 +9980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2151"
+     "referenced_type" : "type-2592"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8430,10 +9996,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8443,10 +10009,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8455,13 +10021,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8471,10 +10037,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8484,16 +10050,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8502,14 +10068,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8518,14 +10084,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8534,14 +10100,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8550,14 +10116,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8568,13 +10134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2154"
+     "referenced_type" : "type-2595"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8584,13 +10150,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8600,13 +10166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8617,13 +10183,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2600"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8633,13 +10199,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8649,13 +10215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8665,27 +10231,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
-     "referenced_type" : "type-1757"
+     "referenced_type" : "type-1988"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2166"
+     "referenced_type" : "type-2607"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8696,13 +10262,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-2167"
+     "referenced_type" : "type-2608"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8711,19 +10277,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
-     "referenced_type" : "type-1757"
+     "referenced_type" : "type-1988"
     },
     {
-     "referenced_type" : "type-2168"
+     "referenced_type" : "type-2609"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8734,10 +10300,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8747,13 +10313,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8763,13 +10329,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8779,10 +10345,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8792,10 +10358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8805,10 +10371,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8818,27 +10384,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2610"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8849,13 +10415,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-2170"
+     "referenced_type" : "type-2611"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8864,19 +10430,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2171"
+     "referenced_type" : "type-2612"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8885,19 +10451,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2613"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8906,19 +10472,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2173"
+     "referenced_type" : "type-2614"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8927,19 +10493,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2174"
+     "referenced_type" : "type-2615"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8948,19 +10514,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2175"
+     "referenced_type" : "type-2616"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8971,10 +10537,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8984,13 +10550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9000,13 +10566,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9016,10 +10582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9029,10 +10595,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9042,10 +10608,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9055,16 +10621,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9074,13 +10640,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2176"
+     "referenced_type" : "type-2617"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9090,13 +10656,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2177"
+     "referenced_type" : "type-2618"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9106,13 +10672,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9122,13 +10688,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2619"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9137,19 +10703,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1936"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9159,13 +10725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2620"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9175,10 +10741,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9188,10 +10754,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9201,10 +10767,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9214,16 +10780,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9233,16 +10799,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9252,13 +10818,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9268,13 +10834,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9284,16 +10850,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9303,19 +10869,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9325,13 +10891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2621"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9341,13 +10907,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2622"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9357,16 +10923,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9376,19 +10942,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9398,13 +10964,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9414,13 +10980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2182"
+     "referenced_type" : "type-2623"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9430,16 +10996,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2183"
+     "referenced_type" : "type-2624"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9448,22 +11014,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9472,22 +11038,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9497,13 +11063,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2625"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9513,10 +11079,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9526,10 +11092,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9539,22 +11105,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9564,16 +11130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2185"
+     "referenced_type" : "type-2626"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9583,19 +11149,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9605,16 +11171,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9624,16 +11190,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9643,19 +11209,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9664,25 +11230,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9691,19 +11257,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2186"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9712,19 +11278,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9734,16 +11300,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9753,16 +11319,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9772,13 +11338,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2187"
+     "referenced_type" : "type-2628"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9788,10 +11354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9801,16 +11367,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9820,13 +11386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2188"
+     "referenced_type" : "type-2629"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9836,13 +11402,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9852,25 +11418,435 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2217"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-2147",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::sendObituary",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2235"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2235"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2235"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2235"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2235"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2235"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2235"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2171"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-906"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2226"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2166"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2630"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::HidlMemory::getInstance",
    "linker_set_key" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-65"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9879,10 +11855,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9891,16 +11867,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9911,19 +11887,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9934,10 +11910,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9948,19 +11924,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9971,10 +11947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9984,10 +11960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9997,10 +11973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10010,24 +11986,155 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3403"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3405"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3405"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3405"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3405"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3706"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3706"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3706"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3706"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::fromBinder",
    "linker_set_key" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-35", "type-373", "type-229" ]
+   "template_args" : [ "type-302", "type-368", "type-299" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10035,12 +12142,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-148", "type-249", "type-247" ]
+   "template_args" : [ "type-495", "type-822", "type-820" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10048,12 +12155,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-156", "type-279", "type-277" ]
+   "template_args" : [ "type-498", "type-848", "type-846" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10061,12 +12168,139 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-129", "type-131", "type-228" ]
+   "template_args" : [ "type-517", "type-729", "type-803" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "access" : "private",
@@ -10076,10 +12310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10089,17 +12323,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10109,13 +12343,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10125,13 +12359,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10141,13 +12375,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10157,10 +12391,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10170,13 +12404,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10186,13 +12420,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10202,13 +12436,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10218,10 +12452,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10231,10 +12465,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10244,10 +12478,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10257,13 +12491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10273,13 +12507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10289,13 +12523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10305,16 +12539,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10324,10 +12558,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10338,16 +12572,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10358,13 +12592,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10374,13 +12608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10390,13 +12624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10406,16 +12640,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10425,13 +12659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10441,13 +12675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10457,10 +12691,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10470,13 +12704,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10486,13 +12720,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10502,16 +12736,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10521,13 +12755,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10537,13 +12771,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10553,10 +12787,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10566,10 +12800,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10579,10 +12813,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10592,13 +12826,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10608,13 +12842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10624,13 +12858,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10640,28 +12874,437 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMaxThreads",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::startThreadPool",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-694"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-3617",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setCallRestriction",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-2243"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getKernelReferences",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::becomeContextManager",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-2242"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-165",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-2193",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::self",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2252"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "function_name" : "android::hardware::writeToParcel",
    "linker_set_key" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-787"
+     "referenced_type" : "type-321"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10670,28 +13313,721 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKjjPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
+   "return_type" : "type-3446",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::clearCaller",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::stopProcess",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setupPolling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::flushCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearLastError",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::executeCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-425"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-336",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2166"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-336"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::self",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
+   "return_type" : "type-3446",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::process",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::shutdown",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::transact",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2166"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::sendReply",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    },
+    {
+     "referenced_type" : "type-2166"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3446"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
    "function_name" : "android::hardware::readFromParcel",
    "linker_set_key" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10700,31 +14036,49 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-265",
+   "return_type" : "type-72",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::release_object",
+   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3428"
+    },
+    {
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::interfacesEqual",
    "linker_set_key" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_",
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::handleBinderPoll",
    "linker_set_key" : "_ZN7android8hardware16handleBinderPollEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10733,37 +14087,174 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
+   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2315"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
+   "return_type" : "type-2316",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::print",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2315"
+    },
+    {
+     "referenced_type" : "type-41"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2315"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::addPostCommandTask",
    "linker_set_key" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-324"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::setupBinderPolling",
    "linker_set_key" : "_ZN7android8hardware18setupBinderPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10772,10 +14263,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10785,17 +14276,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10805,10 +14296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10818,16 +14309,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10836,22 +14327,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::setupTransportPolling",
    "linker_set_key" : "_ZN7android8hardware21setupTransportPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10860,19 +14351,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10881,19 +14372,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10902,19 +14393,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10923,13 +14414,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10938,19 +14429,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10959,19 +14450,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10980,19 +14471,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11001,28 +14492,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-72",
+   "return_type" : "type-383",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11032,13 +14523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-315"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11048,10 +14539,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
-   "return_type" : "type-359",
+   "return_type" : "type-307",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11061,19 +14552,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11083,19 +14574,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11104,25 +14595,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11131,22 +14622,950 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-119"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::Parcel::writeFloat",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-237"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-151"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-336"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::finishWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeDouble",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-6"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeObject",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3896" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-71"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::restartWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeCString",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInplace",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::writePointer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::continueWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-287"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUnpadded",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::acquireObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::freeDataNoInit",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::releaseObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataCapacity",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeWeakBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3560"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeStrongBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKjjPFvPS1_S3_jS5_jPvES7_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2162"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
+   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::incrementNumReferences",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
+   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::write",
+   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::remove",
+   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::freeData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::growData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setError",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::initState",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBool",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-483"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::fromStatusT",
    "linker_set_key" : "_ZN7android8hardware6Status11fromStatusTEi",
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11156,16 +15575,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11175,13 +15594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11190,10 +15609,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11202,19 +15621,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "function_name" : "android::hardware::Status::ok",
    "linker_set_key" : "_ZN7android8hardware6Status2okEv",
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11225,16 +15644,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11245,19 +15664,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11268,16 +15687,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11288,35 +15707,162 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2296"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2296"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-2144",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-2147",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::TaskRunner::push",
    "linker_set_key" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-248"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11326,13 +15872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11342,10 +15888,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11355,10 +15901,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11368,10 +15914,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11381,16 +15927,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "function_name" : "android::hardware::details::debuggable",
    "linker_set_key" : "_ZN7android8hardware7details10debuggableEv",
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11399,18 +15945,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-114", "type-35", "type-261" ]
+   "template_args" : [ "type-504", "type-302", "type-830" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11418,18 +15964,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-148", "type-35", "type-249" ]
+   "template_args" : [ "type-495", "type-302", "type-822" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11437,18 +15983,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-35", "type-270" ]
+   "template_args" : [ "type-514", "type-302", "type-839" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11456,18 +16002,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-114", "type-270" ]
+   "template_args" : [ "type-514", "type-504", "type-839" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11475,18 +16021,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-156", "type-35", "type-279" ]
+   "template_args" : [ "type-498", "type-302", "type-848" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11494,18 +16040,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-35", "type-131" ]
+   "template_args" : [ "type-517", "type-302", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11513,18 +16059,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-114", "type-131" ]
+   "template_args" : [ "type-517", "type-504", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11532,18 +16078,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-113", "type-131" ]
+   "template_args" : [ "type-517", "type-514", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -11551,10 +16097,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-1120",
+   "return_type" : "type-1491",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -11564,10 +16110,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11577,10 +16123,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11590,13 +16136,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     },
     {
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-114"
     }
    ],
-   "return_type" : "type-693",
+   "return_type" : "type-205",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11605,10 +16151,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11617,12 +16163,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-35", "type-108" ]
+   "template_args" : [ "type-302", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11630,12 +16176,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-148", "type-108" ]
+   "template_args" : [ "type-495", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11643,12 +16189,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-156", "type-108" ]
+   "template_args" : [ "type-498", "type-77" ]
   },
   {
    "access" : "protected",
@@ -11658,13 +16204,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-142"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11675,14 +16221,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11693,13 +16239,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11709,16 +16255,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11728,16 +16274,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11747,10 +16293,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11760,10 +16306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11773,10 +16319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11785,23 +16331,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
    "function_name" : "android::hardware::details::getPidIfSharable",
    "linker_set_key" : "_ZN7android8hardware7details16getPidIfSharableEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -11810,19 +16356,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::details::getVndkVersionStr",
    "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv",
-   "return_type" : "type-1121",
+   "return_type" : "type-630",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11831,18 +16377,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-261", "type-114", "type-108", "type-108" ]
+   "template_args" : [ "type-830", "type-504", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11850,18 +16396,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-249", "type-148", "type-108", "type-108" ]
+   "template_args" : [ "type-822", "type-495", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11869,18 +16415,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-270", "type-113", "type-108", "type-108" ]
+   "template_args" : [ "type-839", "type-514", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11888,18 +16434,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-279", "type-156", "type-108", "type-108" ]
+   "template_args" : [ "type-848", "type-498", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11907,29 +16453,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-131", "type-129", "type-108", "type-108" ]
+   "template_args" : [ "type-729", "type-517", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-320",
+   "return_type" : "type-884",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-326",
+   "return_type" : "type-885",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -11938,19 +16484,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11959,10 +16505,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -11971,10 +16517,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11983,28 +16529,363 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::onTransact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2166"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2631"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-2169"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-2144",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-2171"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-906"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-2174",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2166"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2632"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2285"
+    },
+    {
+     "referenced_type" : "type-3710"
+    }
+   ],
+   "return_type" : "type-2285",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2285"
+    },
+    {
+     "referenced_type" : "type-3707"
+    }
+   ],
+   "return_type" : "type-2285",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::operator<<",
    "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-58"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-191",
+   "return_type" : "type-58",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12013,26 +16894,58 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     }
    ],
-   "return_type" : "type-691",
+   "return_type" : "type-203",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::BpHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2184"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2237"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::hidl_handle::getNativeHandle",
    "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12042,10 +16955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12055,10 +16968,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12068,10 +16981,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-102",
+   "return_type" : "type-44",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12081,10 +16994,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-100",
+   "return_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12094,10 +17007,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12107,37 +17020,1519 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-1137",
+   "return_type" : "type-643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::isContextManager",
+   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3657"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isServingCall",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
+   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2319"
+    }
+   ],
+   "return_type" : "type-2280",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::clearCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::errorCheck",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::findBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3588"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3592"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3592"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3587"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-6",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-3591",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3897" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3582"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3584"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::scanForFds",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcDataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readCString",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-78",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::updateCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataCapacity",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::objectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-297"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3589"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-286",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcBufferSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3592"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3588"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readWeakBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-2193",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::quickFindBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::enforceInterface",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-435"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3592"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3592"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::verifyBufferObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3596"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16Inplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferChild",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferParent",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3592"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3588"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3593"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3593"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-435"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3592"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3593"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3593"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3593"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::data",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-990",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::read",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::print",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-2285"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcData",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::objects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-2164",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3588"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3580"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataAvail",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3586"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-237",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3581"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-3583"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    }
+   ],
+   "return_type" : "type-336",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3573"
+    },
+    {
+     "referenced_type" : "type-230"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::description",
    "linker_set_key" : "_ZNK7android8hardware6Status11descriptionEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-111"
     }
    ],
-   "return_type" : "type-1138",
+   "return_type" : "type-644",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::IBinder::checkSubclass",
+   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::return_status::assertOk",
    "linker_set_key" : "_ZNK7android8hardware7details13return_status8assertOkEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-118"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2173"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2180"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::getHWBinderKernelReferences",
+   "linker_set_key" : "getHWBinderKernelReferences",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printHexData",
+   "linker_set_key" : "printHexData",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-14"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3396"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printTypeCode",
+   "linker_set_key" : "printTypeCode",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3396"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::stringForIndent",
+   "linker_set_key" : "stringForIndent",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "global_vars" :
@@ -12145,80 +18540,116 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_020IServiceNotification10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceNotification::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_115IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_1::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IClientCallback10descriptorE",
    "name" : "android::hidl::manager::V1_2::IClientCallback::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_2::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_handle21kOffsetOfNativeHandleE",
    "name" : "android::hardware::hidl_handle::kOffsetOfNativeHandle",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
+   "name" : "android::hardware::gTextBuffers",
+   "referenced_type" : "type-2322",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
+   "name" : "android::hardware::gProcessMutex",
+   "referenced_type" : "type-393",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aerrE",
+   "name" : "android::hardware::aerr",
+   "referenced_type" : "type-2285",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4alogE",
+   "name" : "android::hardware::alog",
+   "referenced_type" : "type-2285",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aoutE",
+   "name" : "android::hardware::aout",
+   "referenced_type" : "type-2285",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-1140",
+   "referenced_type" : "type-646",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-1141",
+   "referenced_type" : "type-647",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-822",
+   "referenced_type" : "type-361",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware8gProcessE",
+   "name" : "android::hardware::gProcess",
+   "referenced_type" : "type-2633",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
   }
  ],
  "lvalue_reference_types" :
@@ -12227,8 +18658,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-839",
-   "self_type" : "type-844",
+   "referenced_type" : "type-388",
+   "self_type" : "type-393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12236,17 +18667,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-850",
-   "self_type" : "type-855",
+   "referenced_type" : "type-399",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const &",
+   "name" : "android::RefBase *const &",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const &",
+   "name" : "android::RefBase::weakref_type *const &",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3436",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-763",
-   "self_type" : "type-773",
+   "referenced_type" : "type-286",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12254,17 +18703,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-659",
+   "referenced_type" : "type-165",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const &",
+   "name" : "android::hardware::BHwBinder *const &",
+   "referenced_type" : "type-3413",
+   "self_type" : "type-3432",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
-   "referenced_type" : "type-30",
-   "self_type" : "type-50",
+   "referenced_type" : "type-664",
+   "self_type" : "type-676",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12272,8 +18730,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
-   "referenced_type" : "type-42",
-   "self_type" : "type-53",
+   "referenced_type" : "type-670",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12281,8 +18739,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-587",
+   "self_type" : "type-885",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -12290,17 +18748,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-347",
+   "self_type" : "type-884",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump &",
+   "name" : "android::hardware::HexDump &",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2297",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1222",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12308,8 +18775,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12317,17 +18784,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel &",
+   "name" : "android::hardware::Parcel &",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3693",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
+   "name" : "android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-3640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
-   "referenced_type" : "type-180",
-   "self_type" : "type-185",
+   "referenced_type" : "type-765",
+   "self_type" : "type-768",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12335,8 +18820,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-172",
-   "self_type" : "type-177",
+   "referenced_type" : "type-758",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12344,8 +18829,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-405",
+   "referenced_type" : "type-945",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12353,8 +18838,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12362,8 +18847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
-   "referenced_type" : "type-615",
-   "self_type" : "type-618",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12371,8 +18856,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12380,8 +18865,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2019",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12389,8 +18874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-411",
-   "self_type" : "type-738",
+   "referenced_type" : "type-249",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12398,8 +18883,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-497",
+   "referenced_type" : "type-120",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12407,17 +18892,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-106",
-   "self_type" : "type-418",
+   "referenced_type" : "type-103",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2285",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3301",
+   "self_type" : "type-3300",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-512",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12425,8 +18964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-508",
+   "referenced_type" : "type-571",
+   "self_type" : "type-1032",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12434,8 +18973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-236",
+   "referenced_type" : "type-793",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12443,8 +18982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &",
    "name" : "android::hardware::details::hidl_pointer<const char> &",
-   "referenced_type" : "type-98",
-   "self_type" : "type-317",
+   "referenced_type" : "type-39",
+   "self_type" : "type-86",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12452,8 +18991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-12",
-   "self_type" : "type-999",
+   "referenced_type" : "type-9",
+   "self_type" : "type-584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12461,8 +19000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-194",
-   "self_type" : "type-200",
+   "referenced_type" : "type-473",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12470,8 +19009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &",
    "name" : "android::hardware::details::return_status &",
-   "referenced_type" : "type-105",
-   "self_type" : "type-693",
+   "referenced_type" : "type-112",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12479,8 +19018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-516",
+   "referenced_type" : "type-972",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12488,8 +19027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &",
    "name" : "android::hardware::hidl_handle &",
-   "referenced_type" : "type-77",
-   "self_type" : "type-87",
+   "referenced_type" : "type-28",
+   "self_type" : "type-34",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12497,8 +19036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-201",
-   "self_type" : "type-226",
+   "referenced_type" : "type-60",
+   "self_type" : "type-64",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12506,8 +19045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-190",
+   "referenced_type" : "type-38",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12515,8 +19054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-439",
+   "referenced_type" : "type-968",
+   "self_type" : "type-977",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12524,8 +19063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-429",
+   "referenced_type" : "type-570",
+   "self_type" : "type-967",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12533,8 +19072,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-994",
+   "referenced_type" : "type-575",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12542,8 +19081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-206",
-   "self_type" : "type-208",
+   "referenced_type" : "type-472",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12551,17 +19090,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-246",
+   "referenced_type" : "type-502",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
+   "name" : "android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-425",
+   "self_type" : "type-3442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-72",
-   "self_type" : "type-888",
+   "referenced_type" : "type-383",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
+   "name" : "android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-444",
+   "self_type" : "type-3651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12569,8 +19153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-161",
+   "referenced_type" : "type-744",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12578,8 +19162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-356",
-   "self_type" : "type-399",
+   "referenced_type" : "type-908",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12587,8 +19171,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-300",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12596,8 +19180,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-258",
-   "self_type" : "type-392",
+   "referenced_type" : "type-526",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12605,8 +19189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-395",
+   "referenced_type" : "type-542",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12614,8 +19198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-124",
+   "referenced_type" : "type-531",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12623,8 +19207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-548",
+   "self_type" : "type-1944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12632,8 +19216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-127",
-   "self_type" : "type-140",
+   "referenced_type" : "type-537",
+   "self_type" : "type-734",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12641,8 +19225,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-797",
-   "self_type" : "type-874",
+   "referenced_type" : "type-331",
+   "self_type" : "type-424",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-901",
+   "self_type" : "type-2215",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
+   "name" : "android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-3564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12650,17 +19252,269 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-33",
-   "self_type" : "type-864",
+   "referenced_type" : "type-309",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "char *const &",
+   "name" : "char *const &",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3600",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[10]",
+   "name" : "char const (&)[10]",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3466",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[11]",
+   "name" : "char const (&)[11]",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3491",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[12]",
+   "name" : "char const (&)[12]",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[13]",
+   "name" : "char const (&)[13]",
+   "referenced_type" : "type-3456",
+   "self_type" : "type-3459",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[14]",
+   "name" : "char const (&)[14]",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3509",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[15]",
+   "name" : "char const (&)[15]",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3607",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[16]",
+   "name" : "char const (&)[16]",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3493",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[17]",
+   "name" : "char const (&)[17]",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3512",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[18]",
+   "name" : "char const (&)[18]",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[19]",
+   "name" : "char const (&)[19]",
+   "referenced_type" : "type-3526",
+   "self_type" : "type-3528",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[20]",
+   "name" : "char const (&)[20]",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3506",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[22]",
+   "name" : "char const (&)[22]",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3531",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[25]",
+   "name" : "char const (&)[25]",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3521",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[28]",
+   "name" : "char const (&)[28]",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3542",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[29]",
+   "name" : "char const (&)[29]",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3518",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[2]",
+   "name" : "char const (&)[2]",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3469",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[31]",
+   "name" : "char const (&)[31]",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3503",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[32]",
+   "name" : "char const (&)[32]",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3534",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[35]",
+   "name" : "char const (&)[35]",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3524",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[37]",
+   "name" : "char const (&)[37]",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3515",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[3]",
+   "name" : "char const (&)[3]",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3483",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[4]",
+   "name" : "char const (&)[4]",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[5]",
+   "name" : "char const (&)[5]",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3610",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[6]",
+   "name" : "char const (&)[6]",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3473",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[7]",
+   "name" : "char const (&)[7]",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3500",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[8]",
+   "name" : "char const (&)[8]",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3488",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[9]",
+   "name" : "char const (&)[9]",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3477",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-770",
-   "self_type" : "type-772",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12668,35 +19522,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-167",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1200",
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
+   "name" : "const android::hardware::BpHwBinder::Obituary &",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2226",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2210",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump &",
+   "name" : "const android::hardware::HexDump &",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-3710",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1540",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12704,8 +19567,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12713,8 +19576,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1783",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1987",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -12722,8 +19621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2040",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12731,8 +19630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2094",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -12740,8 +19639,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12749,8 +19657,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-473",
+   "referenced_type" : "type-2919",
+   "self_type" : "type-2921",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12758,8 +19666,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-588",
-   "self_type" : "type-590",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3003",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12767,8 +19675,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-646",
-   "self_type" : "type-648",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3059",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12776,17 +19684,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
+   "referenced_type" : "type-3121",
+   "self_type" : "type-3123",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-316",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3174",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3225",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3687",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1001",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
+   "name" : "const android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-3619",
+   "self_type" : "type-3641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "type-459",
+   "self_type" : "type-952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12794,8 +19756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-109",
+   "referenced_type" : "type-715",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12803,17 +19765,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-413",
+   "referenced_type" : "type-107",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode &",
+   "name" : "const android::hardware::TypeCode &",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-3707",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-483",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12821,8 +19792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-11",
-   "self_type" : "type-76",
+   "referenced_type" : "type-8",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12830,8 +19801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-491",
+   "self_type" : "type-787",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12839,8 +19810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-80",
+   "referenced_type" : "type-31",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12848,8 +19819,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-222",
-   "self_type" : "type-223",
+   "referenced_type" : "type-62",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12857,8 +19828,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-141",
-   "self_type" : "type-151",
+   "referenced_type" : "type-47",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12866,8 +19837,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12875,8 +19846,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-573",
+   "self_type" : "type-1003",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12884,8 +19855,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-445",
-   "self_type" : "type-477",
+   "referenced_type" : "type-982",
+   "self_type" : "type-1004",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12893,8 +19864,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-995",
-   "self_type" : "type-997",
+   "referenced_type" : "type-580",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12902,8 +19873,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-922",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12911,8 +19882,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-292",
+   "referenced_type" : "type-73",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12920,8 +19891,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &",
    "name" : "const android::hidl::base::V1_0::IBase *const &",
-   "referenced_type" : "type-811",
-   "self_type" : "type-812",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12929,26 +19900,134 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-510",
+   "referenced_type" : "type-981",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2196",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
+   "name" : "const android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2169",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-3285",
+   "self_type" : "type-3287",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2334",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3385",
+   "self_type" : "type-3387",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3394",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-439",
+   "self_type" : "type-694",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
+   "name" : "const android::sp<android::hardware::IInterface> &",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-117",
-   "self_type" : "type-123",
+   "referenced_type" : "type-719",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
+   "name" : "const android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-449",
+   "self_type" : "type-3428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12956,8 +20035,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-363",
+   "referenced_type" : "type-907",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12965,8 +20044,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-80",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12974,8 +20053,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-861",
-   "self_type" : "type-863",
+   "referenced_type" : "type-410",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12983,8 +20062,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "type-529",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12992,8 +20071,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-545",
+   "self_type" : "type-738",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13001,8 +20080,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "type-534",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13010,8 +20089,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-553",
+   "self_type" : "type-742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13019,8 +20098,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-540",
+   "self_type" : "type-727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13028,8 +20107,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-873",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1215",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13037,26 +20161,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1197",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1911",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-781",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3658",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13064,8 +20170,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-867",
-   "self_type" : "type-868",
+   "referenced_type" : "type-417",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13073,8 +20179,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-414",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13082,13 +20188,31 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-904",
-   "self_type" : "type-923",
+   "referenced_type" : "type-455",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const char &",
+   "name" : "const char &",
+   "referenced_type" : "type-42",
+   "self_type" : "type-2304",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *const &",
+   "name" : "const char *const &",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2288",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-5",
@@ -13098,10 +20222,19 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object &",
+   "name" : "const flat_binder_object &",
+   "referenced_type" : "type-3577",
+   "self_type" : "type-3579",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13109,227 +20242,332 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-441",
-   "self_type" : "type-992",
+   "referenced_type" : "type-568",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1065",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1122",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1198",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1303",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1373",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1505",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1545",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1612",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1682",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1843",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1898",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1958",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1836",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2030",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2076",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2126",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2346",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2449",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-202",
-   "self_type" : "type-204",
+   "referenced_type" : "type-2517",
+   "self_type" : "type-2519",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2641",
+   "self_type" : "type-2643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-237",
-   "self_type" : "type-245",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2683",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-271",
+   "self_type" : "type-273",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-419",
-   "self_type" : "type-422",
+   "referenced_type" : "type-2748",
+   "self_type" : "type-2750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2773",
+   "self_type" : "type-2781",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-624",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-752",
+   "referenced_type" : "type-2892",
+   "self_type" : "type-2895",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-85",
-   "self_type" : "type-88",
+   "referenced_type" : "type-2979",
+   "self_type" : "type-2981",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-917",
-   "self_type" : "type-919",
+   "referenced_type" : "type-3034",
+   "self_type" : "type-3036",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3094",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3164",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3206",
+   "self_type" : "type-3208",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3257",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3401",
+   "self_type" : "type-3410",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3787",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3857",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-469",
+   "self_type" : "type-471",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-566",
+   "self_type" : "type-569",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-655",
+   "self_type" : "type-657",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-67",
+   "self_type" : "type-69",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-703",
+   "self_type" : "type-706",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-781",
+   "self_type" : "type-783",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-810",
+   "self_type" : "type-818",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-875",
+   "self_type" : "type-877",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-960",
+   "self_type" : "type-963",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-671",
-   "self_type" : "type-673",
+   "referenced_type" : "type-182",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13337,8 +20575,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-604",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13346,8 +20584,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-970",
-   "self_type" : "type-980",
+   "referenced_type" : "type-547",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13355,8 +20593,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-926",
-   "self_type" : "type-934",
+   "referenced_type" : "type-482",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13364,8 +20602,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1132",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13373,44 +20638,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1182",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1153",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1222",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1223",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13418,8 +20647,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13427,35 +20656,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1496",
+   "self_type" : "type-1546",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1548",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-165",
-   "self_type" : "type-176",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13463,8 +20674,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1682",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13472,8 +20692,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1852",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13481,8 +20701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1908",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13490,8 +20710,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1969",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -13499,8 +20746,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1941",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2392",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13508,17 +20755,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-89",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2012",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2462",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13526,8 +20764,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2537",
+   "self_type" : "type-2539",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13535,8 +20773,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2684",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13544,8 +20782,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-2720",
+   "self_type" : "type-2729",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2767",
+   "self_type" : "type-2769",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -13553,8 +20800,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2929",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13562,8 +20809,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-572",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2990",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13571,8 +20818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3046",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13580,8 +20827,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-819",
-   "self_type" : "type-821",
+   "referenced_type" : "type-3103",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3179",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3222",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-358",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13589,17 +20863,89 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-933",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3730",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3877",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-487",
+   "self_type" : "type-489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-52",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-598",
+   "self_type" : "type-600",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-648",
+   "self_type" : "type-707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-751",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13607,8 +20953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13616,8 +20962,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3869",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13625,8 +20980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13634,8 +20989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13643,8 +20998,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-353",
+   "self_type" : "type-352",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
+   "name" : "const std::function<sp<IBinder> (void *)> &",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13652,8 +21016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13661,8 +21025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2120",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13670,17 +21034,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-732",
-   "self_type" : "type-734",
+   "referenced_type" : "type-246",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3251",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3452",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3576",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1620",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13688,8 +21079,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-211",
-   "self_type" : "type-214",
+   "referenced_type" : "type-2755",
+   "self_type" : "type-2758",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-788",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13697,8 +21097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13706,8 +21106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13715,8 +21115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13724,8 +21124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13733,8 +21133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13742,8 +21142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13751,8 +21151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13760,8 +21160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13769,8 +21169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1551",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13778,44 +21178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1359",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1487",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13832,8 +21196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1663",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13841,8 +21205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13850,8 +21214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1761",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13859,8 +21223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1820",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13868,8 +21232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13877,8 +21241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1885",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13895,8 +21259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2033",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13904,8 +21268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13913,8 +21277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13922,8 +21286,161 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2689",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2718",
+   "self_type" : "type-2717",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2802",
+   "self_type" : "type-2801",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3006",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3023",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3063",
+   "self_type" : "type-3062",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13940,8 +21457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13949,8 +21466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-517",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13958,8 +21475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-3885",
+   "self_type" : "type-3884",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13967,8 +21484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13976,8 +21493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-613",
-   "self_type" : "type-612",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13985,8 +21502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
+   "referenced_type" : "type-609",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13994,8 +21511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-804",
-   "self_type" : "type-803",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14003,8 +21520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14012,8 +21529,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-892",
+   "self_type" : "type-891",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-91",
+   "self_type" : "type-90",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14021,26 +21574,44 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-965",
+   "referenced_type" : "type-522",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned char *const &",
+   "name" : "const unsigned char *const &",
+   "referenced_type" : "type-3536",
+   "self_type" : "type-3537",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-677",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-189",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *const &",
+   "name" : "const unsigned int *const &",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3539",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-611",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14048,8 +21619,17 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-981",
-   "self_type" : "type-985",
+   "referenced_type" : "type-561",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const void *const &",
+   "name" : "const void *const &",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14057,8 +21637,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-760",
+   "referenced_type" : "type-14",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14066,17 +21646,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1154",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14084,8 +21655,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1603",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14093,8 +21664,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14102,8 +21673,26 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-203",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2742",
+   "self_type" : "type-2741",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14111,19 +21700,91 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3362",
+   "self_type" : "type-3361",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3712",
+   "self_type" : "type-3711",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-775",
+   "self_type" : "type-774",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-945",
+   "referenced_type" : "type-146",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *const &",
+   "name" : "void *const &",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   }
  ],
  "pointer_types" :
@@ -14132,8 +21793,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CallStack *",
    "name" : "android::CallStack *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-686",
+   "referenced_type" : "type-197",
+   "self_type" : "type-198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14141,8 +21802,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CallStack::StackDeleter *",
    "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-690",
+   "referenced_type" : "type-201",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14150,17 +21811,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-849",
+   "referenced_type" : "type-395",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2247",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3345",
+   "self_type" : "type-3344",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3597",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-839",
-   "self_type" : "type-842",
+   "referenced_type" : "type-388",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14168,8 +21901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-845",
+   "referenced_type" : "type-392",
+   "self_type" : "type-394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14177,8 +21910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-853",
+   "referenced_type" : "type-399",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14186,8 +21919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14195,8 +21928,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-859",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14204,8 +21937,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-66",
+   "referenced_type" : "type-18",
+   "self_type" : "type-25",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase **",
+   "name" : "android::RefBase **",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const *",
+   "name" : "android::RefBase *const *",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1060",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14213,8 +21973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14222,8 +21982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14231,8 +21991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14240,8 +22000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14249,8 +22009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14258,8 +22018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14267,8 +22027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14276,8 +22036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14285,8 +22045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14294,8 +22054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14303,8 +22063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14312,8 +22072,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14321,8 +22081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14330,8 +22090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14339,8 +22099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14348,8 +22108,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-21",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14357,8 +22117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14366,8 +22126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14375,8 +22135,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1994",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14384,8 +22144,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14393,8 +22153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14402,8 +22162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14411,8 +22171,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14420,8 +22180,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14429,8 +22189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14438,8 +22198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14447,8 +22207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14456,8 +22216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14465,8 +22225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-912",
-   "self_type" : "type-911",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2814",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14474,8 +22234,242 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3390",
+   "self_type" : "type-3389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3398",
+   "self_type" : "type-3397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3426",
+   "self_type" : "type-3425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3852",
+   "self_type" : "type-3851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-652",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-700",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-778",
+   "self_type" : "type-777",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14483,17 +22477,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-22",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type **",
+   "name" : "android::RefBase::weakref_type **",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const *",
+   "name" : "android::RefBase::weakref_type *const *",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3416",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-23",
+   "referenced_type" : "type-7",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14501,17 +22513,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-501",
-   "self_type" : "type-502",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-3633",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-763",
-   "self_type" : "type-774",
+   "referenced_type" : "type-286",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14519,8 +22549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-660",
+   "referenced_type" : "type-165",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14528,17 +22558,125 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase *> *",
+   "name" : "android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3433",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Vector<android::String8> *",
    "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
+   "referenced_type" : "type-193",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-379",
+   "self_type" : "type-3429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3278",
+   "self_type" : "type-3277",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3453",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3571",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-377",
+   "self_type" : "type-3636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14546,8 +22684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-509",
+   "referenced_type" : "type-126",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -14555,6 +22693,24 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1043",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
    "referenced_type" : "type-1227",
    "self_type" : "type-1226",
    "size" : 4,
@@ -14564,8 +22720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14573,8 +22729,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2708",
+   "self_type" : "type-2707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14582,8 +22819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14591,8 +22828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14600,8 +22837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14609,8 +22846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14618,8 +22855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14627,8 +22864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-3138",
+   "self_type" : "type-3137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14636,8 +22873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14645,8 +22882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14654,8 +22891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14663,8 +22900,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "type-737",
+   "self_type" : "type-736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14672,35 +22918,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-915",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "linker_set_key" : "android::hardware::BHwBinder **",
+   "name" : "android::hardware::BHwBinder **",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-3409",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "linker_set_key" : "android::hardware::BHwBinder *const *",
+   "name" : "android::hardware::BHwBinder *const *",
+   "referenced_type" : "type-3413",
+   "self_type" : "type-3414",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder *",
+   "name" : "android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
+   "name" : "android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2235",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwRefBase *",
+   "name" : "android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2180",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput *",
+   "name" : "android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2315",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2316",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-39",
+   "referenced_type" : "type-664",
+   "self_type" : "type-667",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14708,8 +23062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-46",
+   "referenced_type" : "type-670",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14717,8 +23071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-806",
+   "referenced_type" : "type-326",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14726,8 +23080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-587",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14735,8 +23089,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-825",
+   "referenced_type" : "type-347",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14744,17 +23098,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump *",
+   "name" : "android::hardware::HexDump *",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2296",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::HidlMemory *",
    "name" : "android::hardware::HidlMemory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14762,8 +23125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14771,8 +23134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,8 +23143,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14789,8 +23152,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14798,8 +23161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14807,8 +23170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14816,8 +23179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14825,8 +23188,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14834,8 +23197,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14843,8 +23206,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14852,8 +23215,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14861,8 +23224,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1933",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14870,8 +23233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14879,8 +23242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14888,8 +23251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14897,8 +23260,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14906,8 +23269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14915,8 +23278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14924,8 +23287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-345",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2552",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14933,8 +23296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14942,8 +23305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14951,8 +23314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14960,8 +23323,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14969,8 +23332,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2964",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14978,8 +23341,134 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-3018",
+   "self_type" : "type-3017",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3071",
+   "self_type" : "type-3070",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3198",
+   "self_type" : "type-3197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3826",
+   "self_type" : "type-3825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-385",
+   "self_type" : "type-384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-615",
+   "self_type" : "type-614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14987,8 +23476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14996,8 +23485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15005,8 +23494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15014,8 +23503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15023,8 +23512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1873",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15032,8 +23521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15041,8 +23530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15050,8 +23539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15059,8 +23548,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3011",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3135",
+   "self_type" : "type-3134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-903",
+   "self_type" : "type-902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15068,8 +23620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15077,8 +23629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15086,8 +23638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1725",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15095,8 +23647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15104,8 +23656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15113,8 +23665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15122,8 +23674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2010",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15131,8 +23683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15140,17 +23692,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-3405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2864",
+   "self_type" : "type-2863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2967",
+   "self_type" : "type-2966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3020",
+   "self_type" : "type-3019",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3073",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3146",
+   "self_type" : "type-3145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3200",
+   "self_type" : "type-3199",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IPCThreadState *",
+   "name" : "android::hardware::IPCThreadState *",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-930",
+   "referenced_type" : "type-484",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -15158,8 +23782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15167,17 +23791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1544",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15185,8 +23800,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15194,8 +23809,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1922",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15203,8 +23854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15212,8 +23863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15221,8 +23872,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15230,8 +23890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-2926",
+   "self_type" : "type-2925",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15239,8 +23899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
+   "referenced_type" : "type-3005",
+   "self_type" : "type-3004",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15248,8 +23908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-3061",
+   "self_type" : "type-3060",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15257,8 +23917,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-3125",
+   "self_type" : "type-3124",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3227",
+   "self_type" : "type-3226",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15266,8 +23962,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15275,8 +23971,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-2698",
+   "self_type" : "type-2697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PassthroughServiceManager *",
+   "name" : "android::hardware::PassthroughServiceManager *",
+   "referenced_type" : "type-722",
+   "self_type" : "type-721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PoolThread *",
+   "name" : "android::hardware::PoolThread *",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15284,8 +23998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15293,8 +24007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15302,8 +24016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15311,8 +24025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15320,8 +24034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15329,8 +24043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15338,8 +24052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15347,8 +24061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15356,8 +24070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15365,8 +24079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15374,8 +24088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15383,8 +24097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15392,8 +24106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15401,17 +24115,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2969",
+   "self_type" : "type-2968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3022",
+   "self_type" : "type-3021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3148",
+   "self_type" : "type-3147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-446",
+   "self_type" : "type-445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
+   "name" : "android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-765",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15419,8 +24223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-174",
+   "referenced_type" : "type-758",
+   "self_type" : "type-759",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15428,8 +24232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-945",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15437,8 +24241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15446,8 +24250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15455,8 +24259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15464,8 +24268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15473,8 +24277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-736",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15482,8 +24286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-488",
+   "referenced_type" : "type-120",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15491,17 +24295,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-407",
+   "referenced_type" : "type-103",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput *",
+   "name" : "android::hardware::TextOutput *",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-3706",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
+   "name" : "android::hardware::TextOutput::Bundle *",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2286",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TypeCode *",
+   "name" : "android::hardware::TypeCode *",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2292",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1273",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15509,8 +24349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15518,8 +24358,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-972",
+   "referenced_type" : "type-3844",
+   "self_type" : "type-3843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
+   "name" : "android::hardware::details::ClientCounterCallback *",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15527,8 +24376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-51",
+   "referenced_type" : "type-674",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15536,8 +24385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-54",
+   "referenced_type" : "type-678",
+   "self_type" : "type-680",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15545,8 +24394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-361",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15554,8 +24403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-601",
+   "self_type" : "type-603",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15563,8 +24412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-826",
+   "referenced_type" : "type-364",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15572,8 +24421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-998",
+   "referenced_type" : "type-128",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15581,8 +24430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::TaskRunner *",
    "name" : "android::hardware::details::TaskRunner *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-726",
+   "referenced_type" : "type-208",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -15590,8 +24439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1381",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15599,8 +24448,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-149",
+   "referenced_type" : "type-2711",
+   "self_type" : "type-2710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15608,8 +24466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-511",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15617,8 +24475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-507",
+   "referenced_type" : "type-571",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15626,8 +24484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-235",
+   "referenced_type" : "type-793",
+   "self_type" : "type-808",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15635,8 +24493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> *",
    "name" : "android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-314",
+   "referenced_type" : "type-39",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15644,8 +24502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-936",
+   "referenced_type" : "type-9",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15653,8 +24511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-473",
+   "self_type" : "type-776",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15662,8 +24520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-442",
+   "referenced_type" : "type-112",
+   "self_type" : "type-113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15671,8 +24529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15680,8 +24538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15689,8 +24547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-83",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15698,8 +24556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-78",
+   "referenced_type" : "type-28",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15707,8 +24565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-201",
-   "self_type" : "type-213",
+   "referenced_type" : "type-60",
+   "self_type" : "type-61",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15716,8 +24574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-122",
+   "referenced_type" : "type-38",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15725,8 +24583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-436",
+   "referenced_type" : "type-968",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15734,8 +24592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-570",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15743,8 +24601,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-221",
+   "referenced_type" : "type-792",
+   "self_type" : "type-796",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15752,8 +24610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-990",
-   "self_type" : "type-993",
+   "referenced_type" : "type-575",
+   "self_type" : "type-578",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15761,8 +24619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-205",
+   "referenced_type" : "type-472",
+   "self_type" : "type-784",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15770,8 +24628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-265",
+   "referenced_type" : "type-70",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15779,8 +24637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-776",
+   "referenced_type" : "type-299",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15788,8 +24646,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "type-368",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15797,8 +24655,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15806,8 +24664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15815,8 +24673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-260",
+   "referenced_type" : "type-828",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
@@ -15824,8 +24682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-247",
-   "self_type" : "type-248",
+   "referenced_type" : "type-820",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15833,8 +24691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-371",
+   "referenced_type" : "type-830",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15842,8 +24700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-394",
+   "referenced_type" : "type-822",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15851,8 +24709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-370",
+   "referenced_type" : "type-917",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15860,8 +24718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-528",
-   "self_type" : "type-529",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15869,8 +24727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-259",
+   "referenced_type" : "type-504",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15878,8 +24736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "type-502",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15887,8 +24745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
+   "referenced_type" : "type-495",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15896,8 +24754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-837",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15905,8 +24763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-605",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15914,8 +24772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
    "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-604",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15923,8 +24781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
    "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15932,8 +24790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-277",
-   "self_type" : "type-278",
+   "referenced_type" : "type-846",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15941,8 +24799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-285",
+   "referenced_type" : "type-803",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
@@ -15950,8 +24808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-848",
+   "self_type" : "type-1931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15959,8 +24817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-139",
+   "referenced_type" : "type-729",
+   "self_type" : "type-733",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15968,8 +24826,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
    "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15977,8 +24835,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
    "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15986,8 +24844,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
    "name" : "android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-498",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15995,8 +24853,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "type-517",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2199",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Thread> *",
+   "name" : "android::sp<android::Thread> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-3630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16004,17 +24889,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-875",
-   "self_type" : "type-905",
+   "referenced_type" : "type-425",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> *",
    "name" : "android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-366",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16022,8 +24916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-380",
+   "referenced_type" : "type-922",
+   "self_type" : "type-924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16031,8 +24925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-885",
+   "referenced_type" : "type-383",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16040,8 +24934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-157",
+   "referenced_type" : "type-720",
+   "self_type" : "type-743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16049,8 +24943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-893",
-   "self_type" : "type-897",
+   "referenced_type" : "type-444",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16058,8 +24952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-977",
+   "referenced_type" : "type-555",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16067,8 +24961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16076,8 +24970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-397",
+   "referenced_type" : "type-908",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16085,8 +24979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-304",
-   "self_type" : "type-878",
+   "referenced_type" : "type-81",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16094,8 +24988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-883",
+   "referenced_type" : "type-300",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16103,8 +24997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-961",
+   "referenced_type" : "type-526",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16112,8 +25006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-968",
+   "referenced_type" : "type-542",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16121,8 +25015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-963",
+   "referenced_type" : "type-531",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16130,8 +25024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-971",
+   "referenced_type" : "type-548",
+   "self_type" : "type-550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16139,8 +25033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-127",
-   "self_type" : "type-966",
+   "referenced_type" : "type-537",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16148,8 +25042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-797",
-   "self_type" : "type-871",
+   "referenced_type" : "type-331",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16157,8 +25051,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-354",
+   "referenced_type" : "type-901",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
+   "name" : "android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16166,8 +25069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-866",
+   "referenced_type" : "type-307",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16175,8 +25078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-857",
+   "referenced_type" : "type-309",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16184,17 +25087,35 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-719",
+   "referenced_type" : "type-229",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2242",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-450",
+   "referenced_type" : "type-43",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16202,17 +25123,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CallStack *",
    "name" : "const android::CallStack *",
-   "referenced_type" : "type-687",
-   "self_type" : "type-688",
+   "referenced_type" : "type-199",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-755",
-   "self_type" : "type-756",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -16220,17 +25159,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-63",
+   "referenced_type" : "type-23",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-771",
+   "referenced_type" : "type-293",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16238,17 +25195,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-657",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase *> *",
+   "name" : "const android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-3438",
+   "self_type" : "type-3439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-3434",
+   "self_type" : "type-3435",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-684",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-3430",
+   "self_type" : "type-3431",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2225",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16256,17 +25276,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-679",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BHwBinder *",
+   "name" : "const android::hardware::BHwBinder *",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2173",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder *",
+   "name" : "const android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2184",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
+   "name" : "const android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2237",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2182",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
+   "name" : "const android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2319",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-486",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16274,8 +25348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-489",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1016",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16283,8 +25357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-809",
-   "self_type" : "type-810",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16292,8 +25366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-596",
+   "self_type" : "type-597",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16301,17 +25375,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-816",
-   "self_type" : "type-818",
+   "referenced_type" : "type-355",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump *",
+   "name" : "const android::hardware::HexDump *",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2299",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16319,8 +25402,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2143",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16328,17 +25420,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-892",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-441",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
+   "name" : "const android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IInterface *",
+   "name" : "const android::hardware::IInterface *",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3408",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IPCThreadState *",
+   "name" : "const android::hardware::IPCThreadState *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3449",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel *",
+   "name" : "const android::hardware::Parcel *",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-3573",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState *",
+   "name" : "const android::hardware::ProcessState *",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
+   "name" : "const android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-3619",
+   "self_type" : "type-3620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-187",
+   "referenced_type" : "type-769",
+   "self_type" : "type-770",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16346,8 +25501,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-763",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16355,8 +25510,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-408",
+   "referenced_type" : "type-949",
+   "self_type" : "type-951",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16364,8 +25519,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16373,8 +25528,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-620",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16382,8 +25537,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1951",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16391,8 +25546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16400,8 +25555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-908",
+   "referenced_type" : "type-459",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16409,17 +25564,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-412",
-   "self_type" : "type-421",
+   "referenced_type" : "type-107",
+   "self_type" : "type-111",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode *",
+   "name" : "const android::hardware::TypeCode *",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2294",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1389",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16427,8 +25591,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-171",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2726",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-755",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16436,8 +25609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1038",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16445,8 +25618,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-606",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16454,8 +25627,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-240",
+   "referenced_type" : "type-812",
+   "self_type" : "type-813",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16463,8 +25636,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char> *",
    "name" : "const android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-332",
+   "referenced_type" : "type-88",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16472,8 +25645,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-130",
+   "referenced_type" : "type-8",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16481,8 +25654,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-935",
+   "referenced_type" : "type-491",
+   "self_type" : "type-492",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16490,8 +25663,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-455",
-   "self_type" : "type-469",
+   "referenced_type" : "type-115",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16499,8 +25672,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16508,8 +25681,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-881",
-   "self_type" : "type-882",
+   "referenced_type" : "type-431",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16517,8 +25690,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle *",
    "name" : "const android::hardware::hidl_handle *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-93",
+   "referenced_type" : "type-31",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16526,8 +25699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-222",
-   "self_type" : "type-234",
+   "referenced_type" : "type-62",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16535,8 +25708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-189",
+   "referenced_type" : "type-47",
+   "self_type" : "type-56",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16544,8 +25717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2085",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16553,8 +25726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-989",
+   "referenced_type" : "type-573",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16562,8 +25735,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-982",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16571,8 +25744,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-996",
+   "referenced_type" : "type-580",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16580,8 +25753,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-920",
-   "self_type" : "type-921",
+   "referenced_type" : "type-476",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16589,8 +25762,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-287",
+   "referenced_type" : "type-73",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16598,8 +25771,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-372",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -16607,8 +25780,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16616,8 +25789,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-266",
-   "self_type" : "type-267",
+   "referenced_type" : "type-835",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -16625,8 +25798,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-256",
+   "referenced_type" : "type-826",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -16634,8 +25807,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-942",
-   "self_type" : "type-943",
+   "referenced_type" : "type-503",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -16643,8 +25816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16652,8 +25825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-938",
+   "referenced_type" : "type-494",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16661,8 +25834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-843",
+   "self_type" : "type-844",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -16670,8 +25843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-951",
-   "self_type" : "type-952",
+   "referenced_type" : "type-513",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -16679,8 +25852,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-284",
+   "referenced_type" : "type-852",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -16688,8 +25861,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-855",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -16697,8 +25870,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-939",
-   "self_type" : "type-940",
+   "referenced_type" : "type-497",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -16706,17 +25879,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-954",
+   "referenced_type" : "type-516",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::Thread> *",
+   "name" : "const android::sp<android::Thread> *",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
+   "name" : "const android::sp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory> *",
    "name" : "const android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-390",
+   "referenced_type" : "type-100",
+   "self_type" : "type-101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16724,8 +25951,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-889",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
+   "name" : "const android::sp<android::hardware::IInterface> *",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16733,8 +25969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-898",
-   "self_type" : "type-899",
+   "referenced_type" : "type-449",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16742,8 +25978,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-979",
+   "referenced_type" : "type-558",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16751,8 +25987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-167",
-   "self_type" : "type-168",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16760,8 +25996,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-400",
+   "referenced_type" : "type-907",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16769,8 +26005,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-303",
-   "self_type" : "type-393",
+   "referenced_type" : "type-80",
+   "self_type" : "type-102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16778,8 +26014,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-861",
-   "self_type" : "type-884",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16787,8 +26023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-299",
-   "self_type" : "type-962",
+   "referenced_type" : "type-529",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16796,8 +26032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-969",
+   "referenced_type" : "type-545",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16805,8 +26041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-964",
+   "referenced_type" : "type-534",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16814,8 +26050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-974",
+   "referenced_type" : "type-553",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16823,8 +26059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-967",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16832,8 +26068,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-877",
+   "referenced_type" : "type-422",
+   "self_type" : "type-427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2222",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
+   "name" : "const android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16841,8 +26095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-867",
-   "self_type" : "type-869",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16850,17 +26104,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-865",
+   "referenced_type" : "type-414",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const binder_buffer_object *",
+   "name" : "const binder_buffer_object *",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3596",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16868,8 +26131,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16877,8 +26140,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-116",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16886,8 +26149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16895,17 +26158,35 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2916",
+   "self_type" : "type-2970",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-996",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object *",
+   "name" : "const flat_binder_object *",
+   "referenced_type" : "type-3577",
+   "self_type" : "type-3591",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-568",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16913,8 +26194,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-671",
-   "self_type" : "type-672",
+   "referenced_type" : "type-182",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16922,35 +26203,80 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const native_handle **",
+   "name" : "const native_handle **",
+   "referenced_type" : "type-11",
+   "self_type" : "type-3593",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-522",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *",
+   "name" : "const unsigned int *",
+   "referenced_type" : "type-189",
+   "self_type" : "type-2164",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-300",
+   "referenced_type" : "type-76",
+   "self_type" : "type-78",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void **",
+   "name" : "const void **",
+   "referenced_type" : "type-78",
+   "self_type" : "type-3592",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "double *",
+   "name" : "double *",
+   "referenced_type" : "type-6",
+   "self_type" : "type-3587",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "float *",
+   "name" : "float *",
+   "referenced_type" : "type-237",
+   "self_type" : "type-3586",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-728",
-   "self_type" : "type-729",
+   "referenced_type" : "type-242",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16958,8 +26284,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-196",
+   "referenced_type" : "type-14",
+   "self_type" : "type-475",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16967,26 +26293,71 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-668",
-   "self_type" : "type-674",
+   "referenced_type" : "type-179",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long *",
+   "name" : "long long *",
+   "referenced_type" : "type-336",
+   "self_type" : "type-3583",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-90",
+   "referenced_type" : "type-13",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "short *",
+   "name" : "short *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-3581",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-3580",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2303",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1710",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16994,8 +26365,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17003,8 +26374,17 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-361",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17012,8 +26392,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-716",
+   "referenced_type" : "type-146",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -17021,17 +26401,62 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-474",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "unsigned long long *",
+   "name" : "unsigned long long *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-3584",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short *",
+   "name" : "unsigned short *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-3582",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(const void *, void *, void *)",
+   "name" : "void (*)(const void *, void *, void *)",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const char *)",
+   "name" : "void (*)(void *, const char *)",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3396",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-676",
+   "referenced_type" : "type-77",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17039,8 +26464,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-676",
-   "self_type" : "type-731",
+   "referenced_type" : "type-188",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -17050,10 +26475,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase *const",
+   "name" : "android::RefBase *const",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1062",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17062,8 +26497,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17072,8 +26507,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17082,8 +26517,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17092,8 +26527,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17102,8 +26537,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17112,8 +26547,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17122,8 +26557,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17132,8 +26567,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17142,8 +26577,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17152,8 +26587,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17162,8 +26597,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17172,8 +26607,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17182,8 +26617,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17192,8 +26627,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17202,8 +26637,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17212,8 +26647,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1879",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17222,8 +26657,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-197",
-   "self_type" : "type-199",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17232,8 +26667,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17242,8 +26677,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17252,8 +26687,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17262,8 +26697,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-307",
-   "self_type" : "type-309",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17272,8 +26707,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17282,8 +26717,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-552",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2513",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17292,8 +26727,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2639",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17302,8 +26737,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-746",
-   "self_type" : "type-748",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17312,8 +26747,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7",
-   "self_type" : "type-9",
+   "referenced_type" : "type-265",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17322,8 +26757,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-81",
-   "self_type" : "type-83",
+   "referenced_type" : "type-2676",
+   "self_type" : "type-2678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17332,8 +26767,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-911",
-   "self_type" : "type-913",
+   "referenced_type" : "type-2744",
+   "self_type" : "type-2746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17342,28 +26777,628 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-982",
-   "self_type" : "type-984",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2816",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2888",
+   "self_type" : "type-2890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2976",
+   "self_type" : "type-2978",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3033",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3159",
+   "self_type" : "type-3161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3203",
+   "self_type" : "type-3205",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3254",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3317",
+   "self_type" : "type-3319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3367",
+   "self_type" : "type-3369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3389",
+   "self_type" : "type-3391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3425",
+   "self_type" : "type-3427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3690",
+   "self_type" : "type-3692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3784",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-463",
+   "self_type" : "type-465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-562",
+   "self_type" : "type-564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-651",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-699",
+   "self_type" : "type-701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-777",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-871",
+   "self_type" : "type-873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-956",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_type *const",
+   "name" : "android::RefBase::weakref_type *const",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3415",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::BHwBinder *const",
+   "name" : "android::hardware::BHwBinder *const",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-3413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2177",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "char *const",
+   "name" : "char *const",
+   "referenced_type" : "type-186",
+   "self_type" : "type-3599",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[10]",
+   "name" : "char const[10]",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[11]",
+   "name" : "char const[11]",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[12]",
+   "name" : "char const[12]",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[13]",
+   "name" : "char const[13]",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3456",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[14]",
+   "name" : "char const[14]",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[15]",
+   "name" : "char const[15]",
+   "referenced_type" : "type-3606",
+   "self_type" : "type-3605",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[16]",
+   "name" : "char const[16]",
+   "referenced_type" : "type-362",
+   "self_type" : "type-3492",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[17]",
+   "name" : "char const[17]",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[18]",
+   "name" : "char const[18]",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3495",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[19]",
+   "name" : "char const[19]",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3526",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[20]",
+   "name" : "char const[20]",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[22]",
+   "name" : "char const[22]",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[25]",
+   "name" : "char const[25]",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[28]",
+   "name" : "char const[28]",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3540",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[29]",
+   "name" : "char const[29]",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[2]",
+   "name" : "char const[2]",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[31]",
+   "name" : "char const[31]",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[32]",
+   "name" : "char const[32]",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[35]",
+   "name" : "char const[35]",
+   "referenced_type" : "type-3523",
+   "self_type" : "type-3522",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[37]",
+   "name" : "char const[37]",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[3]",
+   "name" : "char const[3]",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[4]",
+   "name" : "char const[4]",
+   "referenced_type" : "type-3603",
+   "self_type" : "type-3602",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[5]",
+   "name" : "char const[5]",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3608",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[6]",
+   "name" : "char const[6]",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[7]",
+   "name" : "char const[7]",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[8]",
+   "name" : "char const[8]",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[9]",
+   "name" : "char const[9]",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::CallStack",
    "name" : "const android::CallStack",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "type-197",
+   "self_type" : "type-199",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3643",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2229",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-742",
-   "self_type" : "type-755",
+   "referenced_type" : "type-257",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -17372,18 +27407,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-55",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-375",
+   "self_type" : "type-3634",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2219",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-763",
-   "self_type" : "type-770",
+   "referenced_type" : "type-286",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17392,18 +27447,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
+   "referenced_type" : "type-165",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase *>",
+   "name" : "const android::Vector<android::RefBase *>",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3438",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
+   "name" : "const android::Vector<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3434",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-683",
+   "referenced_type" : "type-193",
+   "self_type" : "type-195",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
+   "name" : "const android::Vector<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-379",
+   "self_type" : "type-3430",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2224",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-377",
+   "self_type" : "type-3638",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2330",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<int>",
+   "name" : "const android::Vector<int>",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2323",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17412,18 +27537,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-675",
-   "self_type" : "type-678",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BHwBinder",
+   "name" : "const android::hardware::BHwBinder",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2172",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder",
+   "name" : "const android::hardware::BpHwBinder",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2183",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
+   "name" : "const android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2202",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2236",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2209",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2181",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput",
+   "name" : "const android::hardware::BufferedTextOutput",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2318",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
-   "referenced_type" : "type-30",
-   "self_type" : "type-485",
+   "referenced_type" : "type-664",
+   "self_type" : "type-1012",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17432,8 +27627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
-   "referenced_type" : "type-42",
-   "self_type" : "type-487",
+   "referenced_type" : "type-670",
+   "self_type" : "type-1014",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17442,8 +27637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
-   "referenced_type" : "type-792",
-   "self_type" : "type-809",
+   "referenced_type" : "type-326",
+   "self_type" : "type-343",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17452,8 +27647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-587",
+   "self_type" : "type-596",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17462,18 +27657,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
-   "referenced_type" : "type-321",
-   "self_type" : "type-816",
+   "referenced_type" : "type-347",
+   "self_type" : "type-355",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::HexDump",
+   "name" : "const android::hardware::HexDump",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2298",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17482,8 +27687,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2142",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2434",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17492,18 +27707,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-442",
+   "self_type" : "type-441",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
+   "name" : "const android::hardware::IBinder::DeathRecipient",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2231",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IInterface",
+   "name" : "const android::hardware::IInterface",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-3407",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IPCThreadState",
+   "name" : "const android::hardware::IPCThreadState",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-3447",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17512,18 +27767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 68,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1635",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17532,8 +27777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17542,8 +27787,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1217",
+   "self_type" : "type-1216",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -17552,8 +27837,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17562,8 +27847,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -17572,8 +27857,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2165",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17582,8 +27877,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2919",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17592,8 +27887,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3001",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17602,8 +27897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17612,18 +27907,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3172",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3224",
+   "self_type" : "type-3223",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3672",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState",
+   "name" : "const android::hardware::ProcessState",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-3656",
+   "size" : 120,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
+   "name" : "const android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-3619",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-186",
+   "referenced_type" : "type-765",
+   "self_type" : "type-769",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17632,8 +27987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-172",
-   "self_type" : "type-178",
+   "referenced_type" : "type-758",
+   "self_type" : "type-763",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17642,8 +27997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-406",
+   "referenced_type" : "type-945",
+   "self_type" : "type-949",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17652,8 +28007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
-   "referenced_type" : "type-542",
-   "self_type" : "type-546",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1058",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17662,8 +28017,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
-   "referenced_type" : "type-615",
-   "self_type" : "type-619",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1115",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17672,8 +28027,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1950",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17682,8 +28037,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2020",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17692,8 +28047,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-410",
+   "referenced_type" : "type-249",
+   "self_type" : "type-459",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17702,8 +28057,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "type-120",
+   "self_type" : "type-715",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17712,18 +28067,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-106",
-   "self_type" : "type-412",
+   "referenced_type" : "type-103",
+   "self_type" : "type-107",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::TypeCode",
+   "name" : "const android::hardware::TypeCode",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2293",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-484",
+   "referenced_type" : "type-367",
+   "self_type" : "type-1011",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17732,8 +28097,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17742,8 +28107,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-2725",
+   "self_type" : "type-2724",
+   "size" : 52,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::Waiter",
+   "name" : "const android::hardware::details::Waiter",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17752,8 +28127,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-514",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1037",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17762,8 +28137,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-571",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17772,8 +28147,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-239",
+   "referenced_type" : "type-793",
+   "self_type" : "type-812",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17782,8 +28157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char>",
    "name" : "const android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-319",
+   "referenced_type" : "type-39",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17792,8 +28167,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17802,8 +28177,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int>",
    "name" : "const android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-210",
+   "referenced_type" : "type-473",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17812,8 +28187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-105",
-   "self_type" : "type-455",
+   "referenced_type" : "type-112",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17822,8 +28197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32>",
    "name" : "const android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-972",
+   "self_type" : "type-2083",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17832,8 +28207,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-881",
+   "referenced_type" : "type-83",
+   "self_type" : "type-431",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17842,8 +28217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-79",
+   "referenced_type" : "type-28",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17852,8 +28227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-201",
-   "self_type" : "type-222",
+   "referenced_type" : "type-60",
+   "self_type" : "type-62",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17862,8 +28237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-141",
+   "referenced_type" : "type-38",
+   "self_type" : "type-47",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17872,8 +28247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-968",
+   "self_type" : "type-2084",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17882,8 +28257,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-476",
+   "referenced_type" : "type-570",
+   "self_type" : "type-573",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17892,8 +28267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-445",
+   "referenced_type" : "type-792",
+   "self_type" : "type-982",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17902,8 +28277,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
-   "referenced_type" : "type-990",
-   "self_type" : "type-995",
+   "referenced_type" : "type-575",
+   "self_type" : "type-580",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17912,8 +28287,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-920",
+   "referenced_type" : "type-472",
+   "self_type" : "type-476",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17922,8 +28297,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-276",
+   "referenced_type" : "type-70",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17932,8 +28307,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase",
    "name" : "const android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-827",
+   "referenced_type" : "type-368",
+   "self_type" : "type-372",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -17942,8 +28317,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-758",
+   "referenced_type" : "type-280",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17952,8 +28327,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "referenced_type" : "type-302",
+   "self_type" : "type-330",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17962,8 +28337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const",
    "name" : "const android::hidl::base::V1_0::IBase *const",
-   "referenced_type" : "type-795",
-   "self_type" : "type-811",
+   "referenced_type" : "type-329",
+   "self_type" : "type-345",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17972,8 +28347,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-266",
+   "referenced_type" : "type-830",
+   "self_type" : "type-835",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -17982,8 +28357,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-255",
+   "referenced_type" : "type-822",
+   "self_type" : "type-826",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -17992,8 +28367,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager",
    "name" : "const android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-942",
+   "referenced_type" : "type-504",
+   "self_type" : "type-503",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18002,8 +28377,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-444",
+   "referenced_type" : "type-502",
+   "self_type" : "type-981",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18012,8 +28387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-941",
-   "self_type" : "type-946",
+   "referenced_type" : "type-501",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18022,8 +28397,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-944",
+   "referenced_type" : "type-500",
+   "self_type" : "type-506",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18032,8 +28407,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-937",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -18042,8 +28417,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-274",
+   "referenced_type" : "type-839",
+   "self_type" : "type-843",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -18052,8 +28427,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager",
    "name" : "const android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-951",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -18062,8 +28437,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-283",
+   "referenced_type" : "type-848",
+   "self_type" : "type-852",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -18072,8 +28447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-131",
-   "self_type" : "type-286",
+   "referenced_type" : "type-729",
+   "self_type" : "type-855",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -18082,8 +28457,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback",
    "name" : "const android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-939",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -18092,28 +28467,138 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-953",
+   "referenced_type" : "type-517",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
-   "name" : "const android::sp<android::hardware::HidlMemory>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-383",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2194",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::Thread>",
+   "name" : "const android::sp<android::Thread>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-3637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
+   "name" : "const android::sp<android::hardware::BHwBinder>",
+   "referenced_type" : "type-425",
+   "self_type" : "type-3448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2306",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
+   "name" : "const android::sp<android::hardware::HidlMemory>",
+   "referenced_type" : "type-93",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-3286",
+   "self_type" : "type-3285",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-922",
+   "self_type" : "type-2216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-383",
+   "self_type" : "type-439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
+   "name" : "const android::sp<android::hardware::IInterface>",
+   "referenced_type" : "type-928",
+   "self_type" : "type-3404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18122,8 +28607,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18132,8 +28617,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-893",
-   "self_type" : "type-898",
+   "referenced_type" : "type-444",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18142,8 +28627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-978",
+   "referenced_type" : "type-555",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18152,8 +28637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter>",
    "name" : "const android::sp<android::hardware::details::Waiter>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-167",
+   "referenced_type" : "type-744",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18162,8 +28647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18172,8 +28657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-81",
+   "self_type" : "type-80",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18182,8 +28667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-173",
-   "self_type" : "type-861",
+   "referenced_type" : "type-300",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18192,8 +28677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
-   "referenced_type" : "type-258",
-   "self_type" : "type-299",
+   "referenced_type" : "type-526",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18202,8 +28687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "type-542",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18212,8 +28697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-116",
+   "referenced_type" : "type-531",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18222,8 +28707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "type-548",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18232,8 +28717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
+   "referenced_type" : "type-537",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18242,8 +28727,36 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-872",
+   "referenced_type" : "type-331",
+   "self_type" : "type-422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-901",
+   "self_type" : "type-2170",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1213",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-3559",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18251,24 +28764,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -18276,8 +28789,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient>",
    "name" : "const android::wp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-867",
+   "referenced_type" : "type-307",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18286,18 +28799,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-65",
+   "referenced_type" : "type-309",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const binder_buffer_object",
+   "name" : "const binder_buffer_object",
+   "referenced_type" : "type-3595",
+   "self_type" : "type-3594",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-904",
+   "referenced_type" : "type-29",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18306,18 +28829,28 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-101",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const char *const",
+   "name" : "const char *const",
+   "referenced_type" : "type-41",
+   "self_type" : "type-2287",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18326,8 +28859,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18336,8 +28869,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18346,8 +28879,18 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
+   "size" : 276,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-997",
+   "self_type" : "type-996",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18364,10 +28907,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const flat_binder_object",
+   "name" : "const flat_binder_object",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-723",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-237",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18376,8 +28929,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-441",
+   "referenced_type" : "type-14",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18385,240 +28938,360 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1063",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1680",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1841",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1837",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2344",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-202",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2447",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2641",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2680",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "type-2980",
+   "self_type" : "type-2979",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-918",
-   "self_type" : "type-917",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3034",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-987",
-   "self_type" : "type-986",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3092",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3163",
+   "self_type" : "type-3162",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3206",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3401",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3785",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-656",
+   "self_type" : "type-655",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-704",
+   "self_type" : "type-703",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18626,8 +29299,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-671",
+   "referenced_type" : "type-179",
+   "self_type" : "type-182",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18636,8 +29309,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-802",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-336",
+   "self_type" : "type-604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18646,8 +29319,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-13",
+   "self_type" : "type-12",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18656,8 +29329,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-970",
+   "referenced_type" : "type-151",
+   "self_type" : "type-547",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18666,8 +29339,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18676,8 +29349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1070",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18686,8 +29359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18696,8 +29369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18706,8 +29379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18716,8 +29389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1316",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18726,8 +29399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18736,8 +29409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1548",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18746,8 +29419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18756,8 +29429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1684",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18766,8 +29439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1776",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18776,8 +29449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18786,8 +29459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1736",
+   "referenced_type" : "type-1905",
+   "self_type" : "type-1904",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18796,8 +29469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18806,8 +29479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18816,8 +29489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18826,8 +29499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18836,8 +29509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18846,8 +29519,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18856,8 +29529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-224",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18866,8 +29539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2645",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18876,8 +29549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18886,8 +29559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18896,8 +29569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18906,8 +29579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18916,8 +29589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-2915",
+   "self_type" : "type-2914",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18926,8 +29599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2986",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18936,8 +29609,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
+   "referenced_type" : "type-3043",
+   "self_type" : "type-3042",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3100",
+   "self_type" : "type-3099",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3169",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3218",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3795",
+   "self_type" : "type-3794",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-481",
+   "self_type" : "type-480",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-880",
+   "self_type" : "type-879",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-995",
+   "self_type" : "type-994",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18946,8 +29759,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1262",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18956,8 +29769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18966,8 +29779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18976,8 +29789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18986,8 +29799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18996,8 +29809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19006,8 +29819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19016,8 +29829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1751",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19026,8 +29839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19036,8 +29849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19046,8 +29859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2028",
-   "self_type" : "type-2027",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19056,8 +29869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "type-2056",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19066,8 +29879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19076,8 +29889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19086,8 +29899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19096,8 +29909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19106,8 +29919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-645",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19116,8 +29929,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3000",
+   "self_type" : "type-2999",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3056",
+   "self_type" : "type-3055",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3816",
+   "self_type" : "type-3815",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-685",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-817",
+   "self_type" : "type-816",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19126,8 +30039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19136,8 +30049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19146,8 +30059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19156,8 +30069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19166,8 +30079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1562",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19176,8 +30089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19186,8 +30099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1692",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19196,8 +30109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1750",
-   "self_type" : "type-1749",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19206,8 +30119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19216,8 +30129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1867",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19226,8 +30139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19236,8 +30149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19246,8 +30159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19256,8 +30169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19266,8 +30179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19276,8 +30189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19286,8 +30199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2830",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19296,8 +30209,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2945",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2997",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3053",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3117",
+   "self_type" : "type-3116",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3814",
+   "self_type" : "type-3813",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-510",
+   "self_type" : "type-509",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-683",
+   "self_type" : "type-682",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-815",
+   "self_type" : "type-814",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19306,8 +30319,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19316,48 +30359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1151",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19366,8 +30369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19376,38 +30379,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1546",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19416,8 +30399,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1683",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1789",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19426,8 +30419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19436,8 +30429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1906",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19446,8 +30439,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1967",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2043",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -19456,8 +30469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1939",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19466,8 +30479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2010",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2460",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19476,8 +30489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19486,8 +30499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2634",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19496,8 +30509,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2720",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -19506,6 +30529,106 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2989",
+   "self_type" : "type-2988",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3045",
+   "self_type" : "type-3044",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3103",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3221",
+   "self_type" : "type-3220",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3729",
+   "self_type" : "type-3728",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 12,
@@ -19516,58 +30639,68 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-599",
+   "self_type" : "type-598",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-752",
+   "self_type" : "type-751",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19576,8 +30709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2532",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19586,8 +30719,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19596,8 +30739,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19606,8 +30749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19616,8 +30759,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-814",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
+   "name" : "const std::function<sp<IBinder> (void *)>",
+   "referenced_type" : "type-3725",
+   "self_type" : "type-3724",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19626,8 +30779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1185",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -19636,8 +30789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -19646,128 +30799,248 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-247",
+   "self_type" : "type-246",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3450",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1847",
+   "self_type" : "type-1846",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2904",
+   "self_type" : "type-2903",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2984",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3040",
+   "self_type" : "type-3039",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3098",
+   "self_type" : "type-3097",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-976",
+   "self_type" : "type-975",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
    "referenced_type" : "type-1760",
    "self_type" : "type-1759",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-733",
-   "self_type" : "type-732",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1677",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-630",
-   "self_type" : "type-629",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19776,8 +31049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1844",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19786,8 +31059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19796,8 +31069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19806,8 +31079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19816,8 +31089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19826,8 +31099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-2898",
+   "self_type" : "type-2897",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19836,8 +31109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2982",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19846,8 +31119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3037",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19856,18 +31129,58 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
+   "referenced_type" : "type-3096",
+   "self_type" : "type-3095",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3166",
+   "self_type" : "type-3165",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3210",
+   "self_type" : "type-3209",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19876,8 +31189,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2755",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> >",
+   "name" : "const std::vector<int, std::allocator<int> >",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19886,8 +31209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19896,8 +31219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19906,8 +31229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19916,8 +31239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19926,8 +31249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19936,8 +31259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19946,8 +31269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19956,8 +31279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1526",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19966,8 +31289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19976,58 +31299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1360",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1473",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20046,8 +31319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20056,8 +31329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20066,8 +31339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20076,8 +31349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20086,8 +31359,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20106,8 +31389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20116,8 +31399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20126,8 +31409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20136,8 +31419,178 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-291",
-   "self_type" : "type-290",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2131",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2484",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2664",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2690",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2719",
+   "self_type" : "type-2718",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2802",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2836",
+   "self_type" : "type-2835",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2959",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3007",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3025",
+   "self_type" : "type-3024",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3130",
+   "self_type" : "type-3129",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3244",
+   "self_type" : "type-3243",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3263",
+   "self_type" : "type-3262",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20156,8 +31609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20166,8 +31619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20176,8 +31629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-596",
-   "self_type" : "type-595",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20186,8 +31639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20196,8 +31649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20206,8 +31659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-610",
+   "self_type" : "type-609",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20216,8 +31669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20226,8 +31679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-714",
+   "self_type" : "type-713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20236,8 +31689,48 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20246,28 +31739,48 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-454",
+   "referenced_type" : "type-146",
+   "self_type" : "type-522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned char *const",
+   "name" : "const unsigned char *const",
+   "referenced_type" : "type-990",
+   "self_type" : "type-3536",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-677",
+   "referenced_type" : "type-44",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned int *const",
+   "name" : "const unsigned int *const",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-3538",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-16",
+   "self_type" : "type-611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20276,8 +31789,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-981",
+   "referenced_type" : "type-71",
+   "self_type" : "type-561",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20285,38 +31798,121 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-295",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const void *const",
+   "name" : "const void *const",
+   "referenced_type" : "type-78",
+   "self_type" : "type-2197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "void *const",
+   "name" : "void *const",
+   "referenced_type" : "type-188",
+   "self_type" : "type-3478",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 1,
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-860",
+   "referenced_type" : "type-29",
+   "self_type" : "type-409",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-14",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
   }
  ],
  "record_types" :
  [
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-2312"
+    },
+    {
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-2313"
+    }
+   ],
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2311",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mFrameLines",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::CallStack",
    "name" : "android::CallStack",
    "record_kind" : "class",
-   "referenced_type" : "type-685",
-   "self_type" : "type-685",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStackE"
@@ -20325,27 +31921,37 @@
    "alignment" : 1,
    "linker_set_key" : "android::CallStack::StackDeleter",
    "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-689",
-   "self_type" : "type-689",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::CompileTimeAssert<true>",
+   "name" : "android::CompileTimeAssert<true>",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3613",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Debug.h",
+   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -20357,17 +31963,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-375"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-763", "type-72" ],
+   "template_args" : [ "type-286", "type-383" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -20376,18 +31982,38 @@
    [
     {
      "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2154"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-742" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -20397,17 +32023,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -20417,14 +32043,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-389"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -20436,14 +32062,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-844"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -20453,7 +32079,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-255"
     }
    ],
    "fields" :
@@ -20462,20 +32088,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -20487,14 +32113,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-400"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -20506,14 +32132,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-855"
+     "referenced_type" : "type-404"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -20525,14 +32151,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-855"
+     "referenced_type" : "type-404"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -20545,14 +32171,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -20592,8 +32218,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -20603,8 +32229,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -20614,8 +32240,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-7",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -20641,14 +32267,14 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -20659,17 +32285,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-830",
-   "self_type" : "type-830",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-831" ],
+   "template_args" : [ "type-376" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -20716,14 +32342,72 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-675"
+     "access" : "private",
+     "referenced_type" : "type-192"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -20781,14 +32465,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-764"
+     "referenced_type" : "type-287"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -20800,14 +32484,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -20818,7 +32502,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -20827,62 +32511,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-455"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-839"
+     "referenced_type" : "type-388"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-846"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-860"
+     "referenced_type" : "type-409"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-860"
+     "referenced_type" : "type-409"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-901"
+     "referenced_type" : "type-452"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -20972,17 +32656,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -21027,17 +32711,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-36" ],
+   "template_args" : [ "type-308" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -21082,17 +32766,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -21137,17 +32821,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-798" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -21192,17 +32876,72 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2185" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-833" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -21243,38 +32982,148 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2279" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<int>",
+   "name" : "android::Vector<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6VectorIiEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-189"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-189"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -21326,14 +33175,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-124"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -21357,29 +33206,640 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3684",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286", "type-383" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 64,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlive",
+     "field_offset" : 96,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObitsSent",
+     "field_offset" : 128,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObituaries",
+     "field_offset" : 160,
+     "referenced_type" : "type-2150"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 192,
+     "referenced_type" : "type-2152"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mConstantData",
+     "field_offset" : 352,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDescriptorCache",
+     "field_offset" : 384,
+     "referenced_type" : "type-286"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder",
+   "name" : "android::hardware::BpHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2148",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 52,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "recipient",
+     "referenced_type" : "type-901"
+    },
+    {
+     "field_name" : "cookie",
+     "field_offset" : 64,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 96,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
+   "name" : "android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "referenced_type" : "type-2153"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
+   "name" : "android::hardware::BpHwBinder::ObjectManager",
+   "record_kind" : "class",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2152",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "object",
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "cleanupCookie",
+     "field_offset" : 32,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "func",
+     "field_offset" : 64,
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-2177"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-308"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-2179"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2176",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2283"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mFlags",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSeq",
+     "field_offset" : 64,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIndex",
+     "field_offset" : 96,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mGlobalState",
+     "field_offset" : 160,
+     "referenced_type" : "type-2280"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BufferedTextOutput",
+   "name" : "android::hardware::BufferedTextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
+    }
+   ]
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-665"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-32"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-38" ],
+   "template_args" : [ "type-309", "type-367" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -21389,23 +33849,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-671"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-672"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-45" ],
+   "template_args" : [ "type-309", "type-29" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -21415,23 +33875,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-327"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-328"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-795", "type-797" ],
+   "template_args" : [ "type-329", "type-331" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -21441,23 +33901,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-329"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-330", "type-331" ],
+   "template_args" : [ "type-590", "type-591" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -21467,23 +33927,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-322"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-323"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-324", "type-325" ],
+   "template_args" : [ "type-350", "type-351" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -21492,50 +33952,99 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-78"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBytesPerLine",
+     "field_offset" : 64,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSingleLineCutoff",
+     "field_offset" : 96,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlignment",
+     "field_offset" : 128,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCArrayStyle",
+     "field_offset" : 160,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "linker_set_key" : "android::hardware::HexDump",
+   "name" : "android::hardware::HexDump",
+   "record_kind" : "class",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-60"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-349",
-   "self_type" : "type-349",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -21612,19 +34121,439 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-449"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-381"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-2160"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-2160"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-41"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-2246"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-2247"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-2243"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-929"
+     "referenced_type" : "type-485"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -21636,42 +34565,409 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mQuantum",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-2161"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-230"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-1002"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-2162"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-44"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 64,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-2250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-2251"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 224,
+     "referenced_type" : "type-336"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 288,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 320,
+     "referenced_type" : "type-377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 480,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 512,
+     "referenced_type" : "type-2242"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 544,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 576,
+     "referenced_type" : "type-382"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 736,
+     "referenced_type" : "type-165"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 768,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 776,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 800,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 832,
+     "referenced_type" : "type-189"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-2243"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
+   "size" : 120,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 112,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2141"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2227",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21680,17 +34976,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "record_kind" : "class",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-765",
+   "self_type" : "type-765",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -21698,7 +34994,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21707,17 +35003,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-173" ],
+   "template_args" : [ "type-300" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -21725,7 +35021,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21734,17 +35030,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-258" ],
+   "template_args" : [ "type-526" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -21752,7 +35048,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21761,17 +35057,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-146" ],
+   "template_args" : [ "type-542" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -21779,7 +35075,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21788,17 +35084,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-111" ],
+   "template_args" : [ "type-531" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -21806,7 +35102,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21815,17 +35111,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1946",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-548" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -21833,7 +35129,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21842,17 +35138,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-127" ],
+   "template_args" : [ "type-537" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -21860,7 +35156,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21869,17 +35165,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -21887,17 +35183,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -21907,48 +35203,131 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput",
+   "name" : "android::hardware::TextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTO",
+     "referenced_type" : "type-2285"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TextOutput::Bundle",
+   "name" : "android::hardware::TextOutput::Bundle",
+   "record_kind" : "class",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCode",
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TypeCode",
+   "name" : "android::hardware::TypeCode",
+   "record_kind" : "class",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-30" ],
+   "template_args" : [ "type-664" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
   },
   {
@@ -21958,17 +35337,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-670" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
   },
   {
@@ -21978,17 +35357,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-326" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
   },
   {
@@ -21998,17 +35377,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-327" ],
+   "template_args" : [ "type-587" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
   },
   {
@@ -22018,17 +35397,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-321" ],
+   "template_args" : [ "type-347" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
   },
   {
@@ -22039,31 +35418,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-129"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-130"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-131"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -22092,18 +35471,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-367",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -22115,14 +35494,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -22131,8 +35510,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -22141,8 +35520,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -22151,8 +35530,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -22164,19 +35543,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-260"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -22188,19 +35567,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-795"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -22211,16 +35590,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-459"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22229,16 +35608,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-972" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22247,16 +35626,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-572"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-571",
+   "self_type" : "type-571",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -22265,16 +35644,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-794"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-793",
+   "self_type" : "type-793",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -22283,16 +35662,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-986"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -22302,19 +35681,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-186"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -22325,16 +35704,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-40"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -22344,19 +35723,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -22367,16 +35746,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-10"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-9",
+   "self_type" : "type-9",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -22386,19 +35765,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -22410,19 +35789,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-971"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -22434,19 +35813,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-572",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -22457,16 +35836,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -22476,19 +35855,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-475"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -22499,16 +35878,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-270"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-13" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -22518,19 +35897,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -22552,20 +35931,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-103"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -22574,11 +35953,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 32>",
    "name" : "android::hardware::details::std_array<unsigned char, 32>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-989",
+   "self_type" : "type-989",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -22588,16 +35967,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-973"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -22605,7 +35984,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-310"
     }
    ],
    "fields" :
@@ -22614,25 +35993,25 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-307"
     },
     {
      "access" : "private",
      "field_name" : "mCookie",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 160,
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -22712,13 +36091,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -22800,19 +36179,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-9"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -22824,25 +36203,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -22854,25 +36233,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -22884,28 +36263,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-258"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22915,28 +36294,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-969"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-972" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22946,28 +36325,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-425"
+     "referenced_type" : "type-571"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -22977,28 +36356,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-793"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-792",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -23008,28 +36387,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-985"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -23037,7 +36416,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-991"
+     "referenced_type" : "type-576"
     }
    ],
    "fields" :
@@ -23045,14 +36424,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "record_kind" : "class",
-   "referenced_type" : "type-990",
-   "self_type" : "type-990",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -23064,28 +36443,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -23095,19 +36474,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -23117,10 +36496,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23129,13 +36508,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 76,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BnHwBaseE",
@@ -23257,10 +36636,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-371"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23269,19 +36648,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-369"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-370"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE",
@@ -23464,10 +36843,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23476,19 +36855,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2062",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE",
@@ -23614,23 +36993,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-280"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -23641,13 +37020,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-302",
+   "self_type" : "type-302",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -23756,7 +37135,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23765,13 +37144,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE",
@@ -23893,7 +37272,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23902,13 +37281,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE",
@@ -24030,10 +37409,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-833"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24042,19 +37421,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-832"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE",
@@ -24261,10 +37640,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-825"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24273,19 +37652,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-823"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-824"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-822",
+   "self_type" : "type-822",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE",
@@ -24471,10 +37850,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-504"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24483,19 +37862,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE",
@@ -24644,10 +38023,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24656,19 +38035,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE",
@@ -24796,13 +38175,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE",
@@ -24944,33 +38323,33 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-472"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-280"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 64,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
@@ -24980,13 +38359,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -25099,7 +38478,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25108,13 +38487,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE",
@@ -25236,10 +38615,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-842"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25248,19 +38627,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-840"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE",
@@ -25470,10 +38849,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25482,19 +38861,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1099",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE",
@@ -25646,13 +39025,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-504"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE",
@@ -25797,7 +39176,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25806,13 +39185,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE",
@@ -25934,7 +39313,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25943,13 +39322,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE",
@@ -26071,10 +39450,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-851"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26083,19 +39462,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-849"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-281"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE",
@@ -26281,10 +39660,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26293,19 +39672,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-730"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-731"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE",
@@ -26530,10 +39909,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-498"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26542,19 +39921,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1929",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE",
@@ -26682,10 +40061,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-517"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26694,19 +40073,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2004",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE",
@@ -26873,13 +40252,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE",
@@ -26992,13 +40371,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-514"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE",
@@ -27163,19 +40542,65 @@
    "fields" :
    [
     {
+     "field_name" : "key",
+     "referenced_type" : "type-286"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-383"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3615",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286", "type-383" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "key",
+     "referenced_type" : "type-78"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-453"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-903" ],
+   "template_args" : [ "type-454" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -27185,17 +40610,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-426" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -27205,17 +40630,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-2280"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2282" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::HidlMemory>",
    "name" : "android::sp<android::hardware::HidlMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-349" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10HidlMemoryEEE"
   },
   {
@@ -27225,17 +40670,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-902"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-379" ],
+   "template_args" : [ "type-923" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -27245,17 +40690,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-384"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-386" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -27265,17 +40710,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-928",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-387" ],
+   "template_args" : [ "type-931" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -27285,17 +40730,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-121" ],
+   "template_args" : [ "type-723" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -27305,17 +40750,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-894"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-893",
-   "self_type" : "type-893",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-896" ],
+   "template_args" : [ "type-447" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -27325,17 +40770,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-972"
+     "referenced_type" : "type-551"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
+   "referenced_type" : "type-555",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-556" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -27345,17 +40790,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-739"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
    "name" : "android::sp<android::hardware::details::Waiter>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-745" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
   },
   {
@@ -27365,17 +40810,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-908",
+   "self_type" : "type-908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-306" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -27385,17 +40830,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-82"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -27405,17 +40850,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-300",
+   "self_type" : "type-300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -27425,17 +40870,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-504" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -27445,17 +40890,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-148" ],
+   "template_args" : [ "type-495" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -27465,17 +40910,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-514" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
   },
   {
@@ -27485,17 +40930,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -27505,47 +40950,322 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-127",
-   "self_type" : "type-127",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-517" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
+   "name" : "android::trait_pointer<android::RefBase *>",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3555",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3553",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::String16>",
+   "name" : "android::trait_pointer<android::String16>",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3678",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3552",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2185" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3676",
+   "self_type" : "type-3676",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2227" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3677",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3615" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2195" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2279" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3679",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<const void *>",
+   "name" : "android::trait_pointer<const void *>",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<int>",
+   "name" : "android::trait_pointer<int>",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3704",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
+   "name" : "android::trait_trivial_copy<android::RefBase *>",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3548",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3547",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
+   "name" : "android::trait_trivial_copy<android::String16>",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3668",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3544",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2185" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3667",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2227" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3670",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3615" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2195" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2279" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3669",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<const void *>",
+   "name" : "android::trait_trivial_copy<const void *>",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27555,151 +41275,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-224",
+   "self_type" : "type-224",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase *>",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3494",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3482",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
+   "name" : "android::trait_trivial_ctor<android::String16>",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3661",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3470",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2185" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3659",
+   "self_type" : "type-3659",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2227" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3660",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3615" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2195" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2279" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3662",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
+   "name" : "android::trait_trivial_ctor<const void *>",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27709,151 +41561,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase *>",
+   "referenced_type" : "type-3543",
+   "self_type" : "type-3543",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3535",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
+   "name" : "android::trait_trivial_dtor<android::String16>",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3664",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3525",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2185" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3663",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2227" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3666",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3615" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2195" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2279" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3665",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
+   "name" : "android::trait_trivial_dtor<const void *>",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27863,173 +41847,294 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
+   "name" : "android::trait_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3551",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3550",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-763" ],
+   "template_args" : [ "type-286" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3549",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2185" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3671",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2227" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3675",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3615" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2195" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2279" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3674",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<const void *>",
+   "name" : "android::trait_trivial_move<const void *>",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28039,147 +42144,443 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-838",
-   "self_type" : "type-838",
+   "referenced_type" : "type-387",
+   "self_type" : "type-387",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-759",
-   "self_type" : "type-759",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-154",
+   "self_type" : "type-154",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase *>",
+   "name" : "android::traits<android::RefBase *>",
+   "referenced_type" : "type-3558",
+   "self_type" : "type-3558",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
+   "name" : "android::traits<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3557",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::String16>",
+   "name" : "android::traits<android::String16>",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3682",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
+   "name" : "android::traits<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3556",
+   "self_type" : "type-3556",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2185" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3680",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2227" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3681",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3615" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2195" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2279" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3683",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<const void *>",
+   "name" : "android::traits<const void *>",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android6traitsIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<int>",
+   "name" : "android::traits<int>",
+   "referenced_type" : "type-3705",
+   "self_type" : "type-3705",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6traitsIiEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3424"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
+   "name" : "android::use_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3423",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3422"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3421",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3420"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3419",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2207"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2185" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3623"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3622",
+   "self_type" : "type-3622",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2227" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3625"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3624",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3615" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2205"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2195" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2342"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2279" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3686"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<int>",
+   "name" : "android::use_trivial_move<int>",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3685",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-800" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28189,23 +42590,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-902"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-901",
+   "self_type" : "type-901",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-353" ],
+   "template_args" : [ "type-905" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -28215,23 +42616,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-2141"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::hardware::IBinder>",
+   "name" : "android::wp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-2140" ],
+   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-82"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -28241,23 +42668,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-309",
+   "self_type" : "type-309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28266,18 +42693,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -28288,23 +42715,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-227"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -28315,23 +42742,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-231"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-719"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -28342,48 +42769,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-716"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-228"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -28394,38 +42821,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -28436,18 +42863,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -28458,43 +42885,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-227"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-226",
+   "self_type" : "type-226",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -28504,13 +42931,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -28521,35 +42948,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-181"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-177"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-665"
+     "referenced_type" : "type-176"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-663"
+     "referenced_type" : "type-174"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "record_kind" : "union",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
@@ -28560,18 +42987,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -28582,43 +43009,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -28629,48 +43056,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -28681,48 +43108,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -28733,53 +43160,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -28790,31 +43217,58 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lock",
+     "referenced_type" : "type-2321"
+    },
+    {
+     "field_name" : "has_tls",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "field_name" : "tls",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    }
+   ],
+   "linker_set_key" : "thread_store_t",
+   "name" : "thread_store_t",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
+   "size" : 12,
+   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
+   "unique_id" : "thread_store_t"
   }
  ],
  "rvalue_reference_types" :
@@ -28823,8 +43277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
-   "referenced_type" : "type-180",
-   "self_type" : "type-184",
+   "referenced_type" : "type-765",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28832,8 +43286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
-   "referenced_type" : "type-172",
-   "self_type" : "type-175",
+   "referenced_type" : "type-758",
+   "self_type" : "type-760",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28841,8 +43295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
-   "referenced_type" : "type-402",
-   "self_type" : "type-404",
+   "referenced_type" : "type-945",
+   "self_type" : "type-947",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28850,8 +43304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28859,8 +43313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
-   "referenced_type" : "type-615",
-   "self_type" : "type-617",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28868,8 +43322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28877,8 +43331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28886,8 +43340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-411",
-   "self_type" : "type-737",
+   "referenced_type" : "type-249",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28895,8 +43349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-104",
-   "self_type" : "type-494",
+   "referenced_type" : "type-120",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28904,8 +43358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-106",
-   "self_type" : "type-414",
+   "referenced_type" : "type-103",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28913,8 +43367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-38",
-   "self_type" : "type-41",
+   "referenced_type" : "type-367",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -28922,8 +43376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &&",
    "name" : "android::hardware::details::hidl_pointer<const char> &&",
-   "referenced_type" : "type-98",
-   "self_type" : "type-318",
+   "referenced_type" : "type-39",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -28931,8 +43385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-105",
-   "self_type" : "type-451",
+   "referenced_type" : "type-112",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28940,8 +43394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-77",
-   "self_type" : "type-84",
+   "referenced_type" : "type-28",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28949,8 +43403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-201",
-   "self_type" : "type-227",
+   "referenced_type" : "type-60",
+   "self_type" : "type-65",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28958,8 +43412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &&",
    "name" : "android::hardware::hidl_string &&",
-   "referenced_type" : "type-97",
-   "self_type" : "type-188",
+   "referenced_type" : "type-38",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28967,8 +43421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-206",
-   "self_type" : "type-207",
+   "referenced_type" : "type-472",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28976,8 +43430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-875",
-   "self_type" : "type-887",
+   "referenced_type" : "type-425",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28985,8 +43439,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> &&",
    "name" : "android::sp<android::hardware::HidlMemory> &&",
-   "referenced_type" : "type-347",
-   "self_type" : "type-377",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-922",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28994,8 +43457,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-72",
-   "self_type" : "type-886",
+   "referenced_type" : "type-383",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29003,8 +43466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
-   "referenced_type" : "type-356",
-   "self_type" : "type-398",
+   "referenced_type" : "type-908",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29012,8 +43475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-304",
-   "self_type" : "type-879",
+   "referenced_type" : "type-81",
+   "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29021,8 +43484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-173",
-   "self_type" : "type-958",
+   "referenced_type" : "type-300",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29030,8 +43493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
-   "referenced_type" : "type-258",
-   "self_type" : "type-391",
+   "referenced_type" : "type-526",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29039,8 +43502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
-   "referenced_type" : "type-146",
-   "self_type" : "type-396",
+   "referenced_type" : "type-542",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29048,8 +43511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-531",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29057,8 +43520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-548",
+   "self_type" : "type-1943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29066,8 +43529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
-   "referenced_type" : "type-127",
-   "self_type" : "type-301",
+   "referenced_type" : "type-537",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29075,8 +43538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-797",
-   "self_type" : "type-808",
+   "referenced_type" : "type-331",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29084,8 +43547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-33",
-   "self_type" : "type-40",
+   "referenced_type" : "type-309",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29093,8 +43556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-795",
-   "self_type" : "type-807",
+   "referenced_type" : "type-329",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29102,8 +43565,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29111,8 +43574,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1075",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29120,8 +43583,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1686",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29129,8 +43592,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29138,8 +43601,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29147,8 +43610,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29156,8 +43619,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29165,8 +43628,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29174,8 +43637,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2992",
+   "self_type" : "type-2991",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3047",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3108",
+   "self_type" : "type-3107",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3181",
+   "self_type" : "type-3180",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29183,8 +43700,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29192,8 +43709,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1626",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29201,8 +43718,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29210,8 +43727,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1747",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29219,8 +43736,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29228,8 +43745,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29237,8 +43754,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-1977",
+   "self_type" : "type-1976",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29246,8 +43763,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2050",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29255,8 +43772,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2942",
+   "self_type" : "type-2941",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2995",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3113",
+   "self_type" : "type-3112",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3185",
+   "self_type" : "type-3184",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29264,8 +43835,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29273,8 +43844,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1077",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29282,8 +43853,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1688",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29291,8 +43862,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29300,8 +43871,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29309,8 +43880,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29318,8 +43889,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29327,8 +43898,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29336,8 +43907,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2993",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3050",
+   "self_type" : "type-3049",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3111",
+   "self_type" : "type-3110",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/29/32/x86/source-based/libhwbinder.so.lsdump b/29/32/x86/source-based/libhwbinder.so.lsdump
deleted file mode 100644
index bdbfb32..0000000
--- a/29/32/x86/source-based/libhwbinder.so.lsdump
+++ /dev/null
@@ -1,16782 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-157",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [10]",
-   "name" : "char [10]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-719",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [11]",
-   "name" : "char [11]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-741",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [12]",
-   "name" : "char [12]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-716",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [13]",
-   "name" : "char [13]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-712",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [14]",
-   "name" : "char [14]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-760",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [15]",
-   "name" : "char [15]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-121",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-744",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [17]",
-   "name" : "char [17]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-763",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [18]",
-   "name" : "char [18]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-748",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [19]",
-   "name" : "char [19]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-779",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [20]",
-   "name" : "char [20]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-757",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [22]",
-   "name" : "char [22]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-782",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [25]",
-   "name" : "char [25]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-772",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [28]",
-   "name" : "char [28]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-794",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [29]",
-   "name" : "char [29]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-769",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [2]",
-   "name" : "char [2]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-722",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [31]",
-   "name" : "char [31]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-754",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-785",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [35]",
-   "name" : "char [35]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-775",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [37]",
-   "name" : "char [37]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-766",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [3]",
-   "name" : "char [3]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-734",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4]",
-   "name" : "char [4]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [5]",
-   "name" : "char [5]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-124",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [6]",
-   "name" : "char [6]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-726",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [7]",
-   "name" : "char [7]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-751",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [8]",
-   "name" : "char [8]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-738",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [9]",
-   "name" : "char [9]",
-   "referenced_type" : "type-114",
-   "self_type" : "type-729",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-94",
-   "self_type" : "type-228",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-81",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-65",
-   "self_type" : "type-166",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-4",
-   "self_type" : "type-216",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
-   "size" : 1
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char16_t",
-   "name" : "char16_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
-   "size" : 2
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-90",
-   "self_type" : "type-90",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKjjPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKjjPFvPS1_S3_jS5_jPvES7_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel6removeEjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8growDataEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9initStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4dataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
-  },
-  {
-   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "getHWBinderKernelReferences"
-  },
-  {
-   "name" : "printHexData"
-  },
-  {
-   "name" : "printTypeCode"
-  },
-  {
-   "name" : "stringForIndent"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "name" : "_ZN7android8hardware12gTextBuffersE"
-  },
-  {
-   "name" : "_ZN7android8hardware13gProcessMutexE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aerrE"
-  },
-  {
-   "name" : "_ZN7android8hardware4alogE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aoutE"
-  },
-  {
-   "name" : "_ZN7android8hardware8gProcessE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10IInterfaceE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware12ProcessStateE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIiEE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10IInterfaceE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware10PoolThreadE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10TextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware12FdTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware12ProcessStateE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware13LogTextOutputE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String16::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String16::StaticLinkage",
-   "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
-   "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    }
-   ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-580",
-   "self_type" : "type-584",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-143"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "referenced_type" : "type-372",
-   "return_type" : "type-37",
-   "self_type" : "type-372",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "referenced_type" : "type-235",
-   "return_type" : "type-19",
-   "self_type" : "type-235",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-592"
-    }
-   ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-592",
-   "self_type" : "type-591",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
-   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "referenced_type" : "type-68",
-   "return_type" : "type-22",
-   "self_type" : "type-68",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (const void *, void *, void *)",
-   "name" : "void (const void *, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-22",
-   "self_type" : "type-280",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "referenced_type" : "type-647",
-   "return_type" : "type-22",
-   "self_type" : "type-647",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-543"
-    },
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-365",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-49"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-478"
-    },
-    {
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-47",
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-507"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-649",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::sendObituary",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-108"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-111"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-517"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-800"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-817"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-660"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-653"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-656"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-656"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-656"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-656"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    },
-    {
-     "referenced_type" : "type-143"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    },
-    {
-     "referenced_type" : "type-143"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMaxThreads",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::startThreadPool",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-143"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-143"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-143"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-143"
-    },
-    {
-     "referenced_type" : "type-373"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-318",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setCallRestriction",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getKernelReferences",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::becomeContextManager",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-371"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-375",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-31",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::self",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKjjPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
-   "return_type" : "type-700",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::clearCaller",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::stopProcess",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setupPolling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::flushCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearLastError",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::executeCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-707"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-538"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-90",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-800"
-    },
-    {
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::self",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
-   "return_type" : "type-700",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::process",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::shutdown",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::transact",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-800"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::sendReply",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    },
-    {
-     "referenced_type" : "type-800"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-700"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::release_object",
-   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-679"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
-   "return_type" : "type-608",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::print",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeFloat",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-94"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-86"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-65"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::finishWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeDouble",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-96"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeObject",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-78"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-818" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-92"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::restartWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeCString",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInplace",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::writePointer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::continueWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-282"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-373"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-75"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUnpadded",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::acquireObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::freeDataNoInit",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::releaseObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataCapacity",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeWeakBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-43"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeStrongBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-143"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKjjPFvPS1_S3_jS5_jPvES7_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-67"
-    },
-    {
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
-   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::incrementNumReferences",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-82"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-82"
-    },
-    {
-     "referenced_type" : "type-37"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
-   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-82"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::write",
-   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::remove",
-   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::freeData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::growData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setError",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::initState",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBool",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-84"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-69"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-588"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-588"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-649",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::onTransact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-800"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-819"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-29"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-108"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-111"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-37"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-129",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-800"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-820"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "referenced_type" : "type-446"
-    }
-   ],
-   "return_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "referenced_type" : "type-443"
-    }
-   ],
-   "return_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-285"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-531"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::isContextManager",
-   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-385"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isServingCall",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-703"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
-   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-612"
-    }
-   ],
-   "return_type" : "type-575",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::clearCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::errorCheck",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::findBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-97"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-95"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-96",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-822" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-87"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-91"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-92",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::scanForFds",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcDataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readCString",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-102",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::updateCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataCapacity",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::objectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-634"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-281",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcBufferSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-101"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readWeakBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-31",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::quickFindBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::enforceInterface",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-50",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::verifyBufferObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-107"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16Inplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-282",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferChild",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferParent",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-101"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-104"
-    },
-    {
-     "referenced_type" : "type-37"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::data",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::read",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::print",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcData",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::objects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-83"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataAvail",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-94",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-85"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    }
-   ],
-   "return_type" : "type-90",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-64"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::checkSubclass",
-   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-640"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-126"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-139"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-37",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::getHWBinderKernelReferences",
-   "linker_set_key" : "getHWBinderKernelReferences",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printHexData",
-   "linker_set_key" : "printHexData",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-19"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-37"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-648"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printTypeCode",
-   "linker_set_key" : "printTypeCode",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-648"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-21"
-    }
-   ],
-   "return_type" : "type-22",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::stringForIndent",
-   "linker_set_key" : "stringForIndent",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-19"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "global_vars" :
- [
-  {
-   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
-   "name" : "android::hardware::gTextBuffers",
-   "referenced_type" : "type-615",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
-   "name" : "android::hardware::gProcessMutex",
-   "referenced_type" : "type-242",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aerrE",
-   "name" : "android::hardware::aerr",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4alogE",
-   "name" : "android::hardware::alog",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aoutE",
-   "name" : "android::hardware::aout",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware8gProcessE",
-   "name" : "android::hardware::gProcess",
-   "referenced_type" : "type-823",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  }
- ],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-38",
-   "self_type" : "type-242",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-257",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const &",
-   "name" : "android::RefBase *const &",
-   "referenced_type" : "type-668",
-   "self_type" : "type-691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const &",
-   "name" : "android::RefBase::weakref_type *const &",
-   "referenced_type" : "type-666",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 &",
-   "name" : "android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-561",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const &",
-   "name" : "android::hardware::BHwBinder *const &",
-   "referenced_type" : "type-664",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump &",
-   "name" : "android::hardware::HexDump &",
-   "referenced_type" : "type-448",
-   "self_type" : "type-589",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
-   "name" : "android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-319",
-   "self_type" : "type-352",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-440",
-   "self_type" : "type-580",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-315",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
-   "name" : "android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-538",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-574",
-   "self_type" : "type-599",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &",
-   "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
-   "name" : "android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
-   "name" : "android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *const &",
-   "name" : "char *const &",
-   "referenced_type" : "type-112",
-   "self_type" : "type-115",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[10]",
-   "name" : "char const (&)[10]",
-   "referenced_type" : "type-718",
-   "self_type" : "type-720",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[11]",
-   "name" : "char const (&)[11]",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[12]",
-   "name" : "char const (&)[12]",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[13]",
-   "name" : "char const (&)[13]",
-   "referenced_type" : "type-711",
-   "self_type" : "type-714",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[14]",
-   "name" : "char const (&)[14]",
-   "referenced_type" : "type-759",
-   "self_type" : "type-761",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[15]",
-   "name" : "char const (&)[15]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-122",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[16]",
-   "name" : "char const (&)[16]",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[17]",
-   "name" : "char const (&)[17]",
-   "referenced_type" : "type-762",
-   "self_type" : "type-764",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[18]",
-   "name" : "char const (&)[18]",
-   "referenced_type" : "type-747",
-   "self_type" : "type-749",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[19]",
-   "name" : "char const (&)[19]",
-   "referenced_type" : "type-778",
-   "self_type" : "type-780",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[20]",
-   "name" : "char const (&)[20]",
-   "referenced_type" : "type-756",
-   "self_type" : "type-758",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[22]",
-   "name" : "char const (&)[22]",
-   "referenced_type" : "type-781",
-   "self_type" : "type-783",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[25]",
-   "name" : "char const (&)[25]",
-   "referenced_type" : "type-771",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[28]",
-   "name" : "char const (&)[28]",
-   "referenced_type" : "type-793",
-   "self_type" : "type-795",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[29]",
-   "name" : "char const (&)[29]",
-   "referenced_type" : "type-768",
-   "self_type" : "type-770",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[2]",
-   "name" : "char const (&)[2]",
-   "referenced_type" : "type-721",
-   "self_type" : "type-723",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[31]",
-   "name" : "char const (&)[31]",
-   "referenced_type" : "type-753",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[32]",
-   "name" : "char const (&)[32]",
-   "referenced_type" : "type-784",
-   "self_type" : "type-786",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[35]",
-   "name" : "char const (&)[35]",
-   "referenced_type" : "type-774",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[37]",
-   "name" : "char const (&)[37]",
-   "referenced_type" : "type-765",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[3]",
-   "name" : "char const (&)[3]",
-   "referenced_type" : "type-733",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[4]",
-   "name" : "char const (&)[4]",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[5]",
-   "name" : "char const (&)[5]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-125",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[6]",
-   "name" : "char const (&)[6]",
-   "referenced_type" : "type-725",
-   "self_type" : "type-727",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[7]",
-   "name" : "char const (&)[7]",
-   "referenced_type" : "type-750",
-   "self_type" : "type-752",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[8]",
-   "name" : "char const (&)[8]",
-   "referenced_type" : "type-737",
-   "self_type" : "type-739",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[9]",
-   "name" : "char const (&)[9]",
-   "referenced_type" : "type-728",
-   "self_type" : "type-730",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-535",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
-   "name" : "const android::hardware::BpHwBinder::Obituary &",
-   "referenced_type" : "type-487",
-   "self_type" : "type-517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "referenced_type" : "type-494",
-   "self_type" : "type-495",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump &",
-   "name" : "const android::hardware::HexDump &",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
-   "name" : "const android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode &",
-   "name" : "const android::hardware::TypeCode &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-479",
-   "self_type" : "type-481",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
-   "name" : "const android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-702",
-   "self_type" : "type-710",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-140",
-   "self_type" : "type-142",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-5",
-   "self_type" : "type-29",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-505",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-196",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-211",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-625",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-644",
-   "self_type" : "type-646",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
-   "name" : "const android::sp<android::hardware::IInterface> &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
-   "name" : "const android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-56",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-30",
-   "self_type" : "type-43",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char &",
-   "name" : "const char &",
-   "referenced_type" : "type-377",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const &",
-   "name" : "const char *const &",
-   "referenced_type" : "type-582",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-330",
-   "self_type" : "type-496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-76",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-239",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-269",
-   "self_type" : "type-638",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-167",
-   "self_type" : "type-170",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-474",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-705",
-   "self_type" : "type-707",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-291",
-   "self_type" : "type-293",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-75",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *const &",
-   "name" : "const unsigned char *const &",
-   "referenced_type" : "type-789",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *const &",
-   "name" : "const unsigned int *const &",
-   "referenced_type" : "type-791",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-476",
-   "self_type" : "type-477",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *const &",
-   "name" : "const void *const &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int &",
-   "name" : "int &",
-   "referenced_type" : "type-19",
-   "self_type" : "type-619",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-429",
-   "self_type" : "type-428",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *const &",
-   "name" : "void *const &",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-802",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-806",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-40",
-   "self_type" : "type-252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-382",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-699",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-354",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-250",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-256",
-   "self_type" : "type-260",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-264",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase **",
-   "name" : "android::RefBase **",
-   "referenced_type" : "type-11",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const *",
-   "name" : "android::RefBase *const *",
-   "referenced_type" : "type-668",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-187",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-263",
-   "self_type" : "type-262",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-642",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-651",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type **",
-   "name" : "android::RefBase::weakref_type **",
-   "referenced_type" : "type-8",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const *",
-   "name" : "android::RefBase::weakref_type *const *",
-   "referenced_type" : "type-666",
-   "self_type" : "type-667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-275",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-634",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase *> *",
-   "name" : "android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-692",
-   "self_type" : "type-693",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-512",
-   "self_type" : "type-514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-709",
-   "self_type" : "type-708",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-621",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-620",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder **",
-   "name" : "android::hardware::BHwBinder **",
-   "referenced_type" : "type-17",
-   "self_type" : "type-661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const *",
-   "name" : "android::hardware::BHwBinder *const *",
-   "referenced_type" : "type-664",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder *",
-   "name" : "android::hardware::BpHwBinder *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
-   "name" : "android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-485",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-273",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwRefBase *",
-   "name" : "android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput *",
-   "name" : "android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-191",
-   "self_type" : "type-190",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump *",
-   "name" : "android::hardware::HexDump *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-588",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder *",
-   "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-32",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IPCThreadState *",
-   "name" : "android::hardware::IPCThreadState *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-700",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState *",
-   "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
-   "name" : "android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput *",
-   "name" : "android::hardware::TextOutput *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
-   "name" : "android::hardware::TextOutput::Bundle *",
-   "referenced_type" : "type-579",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TypeCode *",
-   "name" : "android::hardware::TypeCode *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-484",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Thread> *",
-   "name" : "android::sp<android::Thread> *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
-   "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-538",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-604",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-506",
-   "self_type" : "type-526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> *",
-   "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-657",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
-   "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-366",
-   "self_type" : "type-543",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
-   "name" : "android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-225",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-372",
-   "self_type" : "type-371",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-803",
-   "self_type" : "type-804",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-610",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase *> *",
-   "name" : "const android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-686",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-694",
-   "self_type" : "type-695",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-515",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-616",
-   "self_type" : "type-617",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-179",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BHwBinder *",
-   "name" : "const android::hardware::BHwBinder *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder *",
-   "name" : "const android::hardware::BpHwBinder *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-285",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
-   "name" : "const android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-488",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-530",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwRefBase *",
-   "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-147",
-   "self_type" : "type-148",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
-   "name" : "const android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-612",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump *",
-   "name" : "const android::hardware::HexDump *",
-   "referenced_type" : "type-447",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
-   "name" : "const android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-524",
-   "self_type" : "type-525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IInterface *",
-   "name" : "const android::hardware::IInterface *",
-   "referenced_type" : "type-659",
-   "self_type" : "type-660",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IPCThreadState *",
-   "name" : "const android::hardware::IPCThreadState *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-703",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel *",
-   "name" : "const android::hardware::Parcel *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState *",
-   "name" : "const android::hardware::ProcessState *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
-   "name" : "const android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode *",
-   "name" : "const android::hardware::TypeCode *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Thread> *",
-   "name" : "const android::sp<android::Thread> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
-   "name" : "const android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-713",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
-   "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-788",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
-   "name" : "const android::sp<android::hardware::IInterface> *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
-   "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
-   "name" : "const android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-107",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char16_t *",
-   "name" : "const char16_t *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-100",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-269",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-167",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-82",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-82",
-   "self_type" : "type-104",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *",
-   "name" : "const unsigned int *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-72",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void **",
-   "name" : "const void **",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double *",
-   "name" : "double *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float *",
-   "name" : "float *",
-   "referenced_type" : "type-94",
-   "self_type" : "type-93",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-235",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long *",
-   "name" : "long long *",
-   "referenced_type" : "type-90",
-   "self_type" : "type-89",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "short *",
-   "name" : "short *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "signed char *",
-   "name" : "signed char *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-66",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long long *",
-   "name" : "unsigned long long *",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned short *",
-   "name" : "unsigned short *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
-   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned int *, unsigned int, void *)",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(const void *, void *, void *)",
-   "name" : "void (*)(const void *, void *, void *)",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-647",
-   "self_type" : "type-648",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-21",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase *const",
-   "name" : "android::RefBase *const",
-   "referenced_type" : "type-11",
-   "self_type" : "type-668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-136",
-   "self_type" : "type-138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-159",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-187",
-   "self_type" : "type-189",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-203",
-   "self_type" : "type-205",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-218",
-   "self_type" : "type-220",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-229",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-262",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-333",
-   "self_type" : "type-335",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-419",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-44",
-   "self_type" : "type-46",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-499",
-   "self_type" : "type-501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-600",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-641",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-650",
-   "self_type" : "type-652",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-676",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_type *const",
-   "name" : "android::RefBase::weakref_type *const",
-   "referenced_type" : "type-8",
-   "self_type" : "type-666",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::BHwBinder *const",
-   "name" : "android::hardware::BHwBinder *const",
-   "referenced_type" : "type-17",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::IBinder *const",
-   "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-32",
-   "self_type" : "type-134",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "char *const",
-   "name" : "char *const",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[10]",
-   "name" : "char const[10]",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[11]",
-   "name" : "char const[11]",
-   "referenced_type" : "type-741",
-   "self_type" : "type-740",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[12]",
-   "name" : "char const[12]",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[13]",
-   "name" : "char const[13]",
-   "referenced_type" : "type-712",
-   "self_type" : "type-711",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[14]",
-   "name" : "char const[14]",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[15]",
-   "name" : "char const[15]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-120",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[16]",
-   "name" : "char const[16]",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[17]",
-   "name" : "char const[17]",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[18]",
-   "name" : "char const[18]",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[19]",
-   "name" : "char const[19]",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[20]",
-   "name" : "char const[20]",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[22]",
-   "name" : "char const[22]",
-   "referenced_type" : "type-782",
-   "self_type" : "type-781",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[25]",
-   "name" : "char const[25]",
-   "referenced_type" : "type-772",
-   "self_type" : "type-771",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[28]",
-   "name" : "char const[28]",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[29]",
-   "name" : "char const[29]",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[2]",
-   "name" : "char const[2]",
-   "referenced_type" : "type-722",
-   "self_type" : "type-721",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[31]",
-   "name" : "char const[31]",
-   "referenced_type" : "type-754",
-   "self_type" : "type-753",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[32]",
-   "name" : "char const[32]",
-   "referenced_type" : "type-785",
-   "self_type" : "type-784",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[35]",
-   "name" : "char const[35]",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[37]",
-   "name" : "char const[37]",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[3]",
-   "name" : "char const[3]",
-   "referenced_type" : "type-734",
-   "self_type" : "type-733",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[4]",
-   "name" : "char const[4]",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[5]",
-   "name" : "char const[5]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[6]",
-   "name" : "char const[6]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[7]",
-   "name" : "char const[7]",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[8]",
-   "name" : "char const[8]",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[9]",
-   "name" : "char const[9]",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-801",
-   "self_type" : "type-803",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-355",
-   "self_type" : "type-357",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-274",
-   "self_type" : "type-522",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-12",
-   "self_type" : "type-502",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-343",
-   "self_type" : "type-345",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-509",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-281",
-   "self_type" : "type-374",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-375",
-   "self_type" : "type-535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase *>",
-   "name" : "const android::Vector<android::RefBase *>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-689",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
-   "name" : "const android::Vector<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-519",
-   "self_type" : "type-685",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-692",
-   "self_type" : "type-694",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
-   "name" : "const android::Vector<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-518",
-   "self_type" : "type-681",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-515",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<int>",
-   "name" : "const android::Vector<int>",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-178",
-   "self_type" : "type-177",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BHwBinder",
-   "name" : "const android::hardware::BHwBinder",
-   "referenced_type" : "type-18",
-   "self_type" : "type-118",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder",
-   "name" : "const android::hardware::BpHwBinder",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
-   "name" : "const android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-286",
-   "self_type" : "type-487",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager",
-   "referenced_type" : "type-273",
-   "self_type" : "type-530",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-494",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwRefBase",
-   "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-133",
-   "self_type" : "type-147",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput",
-   "name" : "const android::hardware::BufferedTextOutput",
-   "referenced_type" : "type-606",
-   "self_type" : "type-611",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::HexDump",
-   "name" : "const android::hardware::HexDump",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder",
-   "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-23",
-   "self_type" : "type-639",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
-   "name" : "const android::hardware::IBinder::DeathRecipient",
-   "referenced_type" : "type-59",
-   "self_type" : "type-524",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IInterface",
-   "name" : "const android::hardware::IInterface",
-   "referenced_type" : "type-287",
-   "self_type" : "type-659",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IPCThreadState",
-   "name" : "const android::hardware::IPCThreadState",
-   "referenced_type" : "type-536",
-   "self_type" : "type-701",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState",
-   "name" : "const android::hardware::ProcessState",
-   "referenced_type" : "type-368",
-   "self_type" : "type-384",
-   "size" : 120,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
-   "name" : "const android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-319",
-   "self_type" : "type-321",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::TypeCode",
-   "name" : "const android::hardware::TypeCode",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Thread>",
-   "name" : "const android::sp<android::Thread>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
-   "name" : "const android::sp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-702",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "referenced_type" : "type-574",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-196",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-645",
-   "self_type" : "type-644",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
-   "name" : "const android::sp<android::hardware::IInterface>",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
-   "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
-   "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-106",
-   "self_type" : "type-105",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-114",
-   "self_type" : "type-377",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-376",
-   "self_type" : "type-582",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const char16_t",
-   "name" : "const char16_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-283",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-96",
-   "self_type" : "type-330",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-94",
-   "self_type" : "type-239",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-164",
-   "self_type" : "type-167",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-90",
-   "self_type" : "type-132",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-86",
-   "self_type" : "type-474",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-84",
-   "self_type" : "type-471",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-705",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-65",
-   "self_type" : "type-71",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char *const",
-   "name" : "const unsigned char *const",
-   "referenced_type" : "type-70",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-55",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int *const",
-   "name" : "const unsigned int *const",
-   "referenced_type" : "type-72",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-92",
-   "self_type" : "type-192",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-88",
-   "self_type" : "type-476",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-22",
-   "self_type" : "type-103",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const void *const",
-   "name" : "const void *const",
-   "referenced_type" : "type-102",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-21",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-37",
-   "self_type" : "type-42",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile int",
-   "name" : "volatile int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-270",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-497"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "d_",
-     "field_offset" : 32,
-     "referenced_type" : "type-604"
-    },
-    {
-     "access" : "private",
-     "field_name" : "s_",
-     "field_offset" : 64,
-     "referenced_type" : "type-605"
-    }
-   ],
-   "linker_set_key" : "Renamer",
-   "name" : "Renamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
-    },
-    {
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-692"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-131",
-   "self_type" : "type-131",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-41"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-343"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-281", "type-50" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-275"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-102", "type-278" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-3" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-39"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-242"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-257"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-257"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-13"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-276"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "record_kind" : "class",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-344" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-276"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-277" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-282"
-    }
-   ],
-   "linker_set_key" : "android::String16",
-   "name" : "android::String16",
-   "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "unique_id" : "_ZTSN7android8String16E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-376"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-36"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-21"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-40"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-42"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-42"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-33"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase *>",
-   "name" : "android::Vector<android::RefBase *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
-   "name" : "android::Vector<android::RefBase::weakref_type *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-375" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
-   "name" : "android::Vector<android::hardware::BHwBinder *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "record_kind" : "class",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "record_kind" : "class",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-178"
-    }
-   ],
-   "linker_set_key" : "android::Vector<int>",
-   "name" : "android::Vector<int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android6VectorIiEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-21"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-55"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-55"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281", "type-50" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102", "type-278" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPolicy",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExtras",
-     "field_offset" : 96,
-     "referenced_type" : "type-20"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReserved0",
-     "field_offset" : 128,
-     "referenced_type" : "type-21"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BHwBinder",
-   "name" : "android::hardware::BHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlive",
-     "field_offset" : 96,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObitsSent",
-     "field_offset" : 128,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObituaries",
-     "field_offset" : 160,
-     "referenced_type" : "type-271"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 192,
-     "referenced_type" : "type-273"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mConstantData",
-     "field_offset" : 352,
-     "referenced_type" : "type-69"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDescriptorCache",
-     "field_offset" : 384,
-     "referenced_type" : "type-281"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder",
-   "name" : "android::hardware::BpHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 52,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "recipient",
-     "referenced_type" : "type-57"
-    },
-    {
-     "field_name" : "cookie",
-     "field_offset" : 64,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
-   "name" : "android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "referenced_type" : "type-274"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
-   "name" : "android::hardware::BpHwBinder::ObjectManager",
-   "record_kind" : "class",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "object",
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "cleanupCookie",
-     "field_offset" : 32,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "func",
-     "field_offset" : 64,
-     "referenced_type" : "type-279"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRemote",
-     "field_offset" : 32,
-     "referenced_type" : "type-134"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 96,
-     "referenced_type" : "type-135"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwRefBase",
-   "name" : "android::hardware::BpHwRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-440"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSeq",
-     "field_offset" : 64,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 128,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGlobalState",
-     "field_offset" : 160,
-     "referenced_type" : "type-575"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BufferedTextOutput",
-   "name" : "android::hardware::BufferedTextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBytesPerLine",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSingleLineCutoff",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlignment",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCArrayStyle",
-     "field_offset" : 160,
-     "referenced_type" : "type-37"
-    }
-   ],
-   "linker_set_key" : "android::hardware::HexDump",
-   "name" : "android::hardware::HexDump",
-   "record_kind" : "class",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder",
-   "name" : "android::hardware::IBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
-   "name" : "android::hardware::IBinder::DeathRecipient",
-   "record_kind" : "class",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IInterface",
-   "name" : "android::hardware::IInterface",
-   "record_kind" : "class",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mProcess",
-     "referenced_type" : "type-537"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingStrongDerefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-518"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingWeakDerefs",
-     "field_offset" : 192,
-     "referenced_type" : "type-519"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteStrongDerefs",
-     "field_offset" : 352,
-     "referenced_type" : "type-520"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteWeakDerefs",
-     "field_offset" : 512,
-     "referenced_type" : "type-519"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIn",
-     "field_offset" : 672,
-     "referenced_type" : "type-62"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOut",
-     "field_offset" : 1216,
-     "referenced_type" : "type-62"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastError",
-     "field_offset" : 1760,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingPid",
-     "field_offset" : 1792,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingSid",
-     "field_offset" : 1824,
-     "referenced_type" : "type-376"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingUid",
-     "field_offset" : 1856,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStrictModePolicy",
-     "field_offset" : 1888,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastTransactionBinderFlags",
-     "field_offset" : 1920,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContextObject",
-     "field_offset" : 1952,
-     "referenced_type" : "type-538"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsLooper",
-     "field_offset" : 1984,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsPollingThread",
-     "field_offset" : 1992,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostCommandTasks",
-     "field_offset" : 2016,
-     "referenced_type" : "type-539"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIPCThreadStateBase",
-     "field_offset" : 2112,
-     "referenced_type" : "type-540"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 2144,
-     "referenced_type" : "type-378"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IPCThreadState",
-   "name" : "android::hardware::IPCThreadState",
-   "record_kind" : "class",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
-   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBufCachePos",
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufCache",
-     "field_offset" : 32,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mError",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 160,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataCapacity",
-     "field_offset" : 224,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataPos",
-     "field_offset" : 256,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 288,
-     "referenced_type" : "type-66"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsCapacity",
-     "field_offset" : 352,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNextObjectHint",
-     "field_offset" : 384,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumRef",
-     "field_offset" : 416,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFdsKnown",
-     "field_offset" : 448,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHasFds",
-     "field_offset" : 456,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllowFds",
-     "field_offset" : 464,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 480,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnerCookie",
-     "field_offset" : 512,
-     "referenced_type" : "type-21"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel",
-   "name" : "android::hardware::Parcel",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6ParcelE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "index",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "buffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "bufend",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
-   "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDriverFD",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVMStart",
-     "field_offset" : 64,
-     "referenced_type" : "type-21"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountDecrement",
-     "field_offset" : 128,
-     "referenced_type" : "type-370"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExecutingThreadsCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMaxThreads",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStarvationStartTimeMs",
-     "field_offset" : 224,
-     "referenced_type" : "type-90"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 288,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandleToObject",
-     "field_offset" : 320,
-     "referenced_type" : "type-348"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mManagesContexts",
-     "field_offset" : 480,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextCheckFunc",
-     "field_offset" : 512,
-     "referenced_type" : "type-371"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextUserData",
-     "field_offset" : 544,
-     "referenced_type" : "type-21"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContexts",
-     "field_offset" : 576,
-     "referenced_type" : "type-355"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRootDir",
-     "field_offset" : 736,
-     "referenced_type" : "type-375"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolStarted",
-     "field_offset" : 768,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSpawnThreadOnStart",
-     "field_offset" : 776,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolSeq",
-     "field_offset" : 800,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMmapSize",
-     "field_offset" : 832,
-     "referenced_type" : "type-55"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 864,
-     "referenced_type" : "type-378"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState",
-   "name" : "android::hardware::ProcessState",
-   "record_kind" : "class",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 120,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 112,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -112,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -112,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "binder",
-     "referenced_type" : "type-32"
-    },
-    {
-     "field_name" : "refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
-   "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput",
-   "name" : "android::hardware::TextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTO",
-     "referenced_type" : "type-580"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TextOutput::Bundle",
-   "name" : "android::hardware::TextOutput::Bundle",
-   "record_kind" : "class",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCode",
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TypeCode",
-   "name" : "android::hardware::TypeCode",
-   "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-281"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-50"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281", "type-50" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-102"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102", "type-278" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
-   "name" : "android::sp<android::hardware::BHwBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-18" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-575"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-577" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-58"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-656"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-287" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
-   "name" : "android::sp<android::hardware::ProcessState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-368" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
-   "name" : "android::trait_pointer<android::RefBase *>",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::String16>",
-   "name" : "android::trait_pointer<android::String16>",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<const void *>",
-   "name" : "android::trait_pointer<const void *>",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<int>",
-   "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
-   "name" : "android::trait_trivial_copy<android::RefBase *>",
-   "referenced_type" : "type-808",
-   "self_type" : "type-808",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
-   "name" : "android::trait_trivial_copy<android::String16>",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<const void *>",
-   "name" : "android::trait_trivial_copy<const void *>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-96" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-94" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-90" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
-   "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
-   "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase *>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
-   "name" : "android::trait_trivial_ctor<android::String16>",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
-   "name" : "android::trait_trivial_ctor<const void *>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-96" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-94" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long long>",
-   "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-90" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
-   "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
-   "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
-   "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase *>",
-   "referenced_type" : "type-796",
-   "self_type" : "type-796",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
-   "name" : "android::trait_trivial_dtor<android::String16>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
-   "name" : "android::trait_trivial_dtor<const void *>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-96" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-94" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long long>",
-   "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-90" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
-   "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-423",
-   "self_type" : "type-423",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
-   "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
-   "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
-   "name" : "android::trait_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String16>",
-   "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-375" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-328",
-   "self_type" : "type-328",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-114" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<const void *>",
-   "name" : "android::trait_trivial_move<const void *>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-96" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-94" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-90" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-65" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned int>",
-   "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-92" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long>",
-   "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-22" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase *>",
-   "name" : "android::traits<android::RefBase *>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
-   "name" : "android::traits<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::String16>",
-   "name" : "android::traits<android::String16>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
-   "name" : "android::traits<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-50" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<const void *>",
-   "name" : "android::traits<const void *>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android6traitsIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<int>",
-   "name" : "android::traits<int>",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android6traitsIiEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-675"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
-   "name" : "android::use_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-673"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-672",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-671"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-670",
-   "self_type" : "type-670",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-492"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-325"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-327"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-490"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-636"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-415"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<int>",
-   "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-58"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-59" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-32"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder>",
-   "name" : "android::wp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-94"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-216"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-228"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-222"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-225"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-64"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-217"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-94"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-94"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-94"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-21"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-216"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-163"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-163"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-161"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-158"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-156"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-161",
-   "self_type" : "type-161",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-88"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-81"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "lock",
-     "referenced_type" : "type-614"
-    },
-    {
-     "field_name" : "has_tls",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "tls",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "thread_store_t",
-   "name" : "thread_store_t",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
-   "unique_id" : "thread_store_t"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "referenced_type" : "type-506",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
-   "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump b/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump
index cc43844..a5069e4 100644
--- a/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libhidlbase.so.lsdump
@@ -5,40 +5,283 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-664",
+   "referenced_type" : "type-43",
+   "self_type" : "type-175",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "char [10]",
+   "name" : "char [10]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3469",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [11]",
+   "name" : "char [11]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3494",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [12]",
+   "name" : "char [12]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3464",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [13]",
+   "name" : "char [13]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3461",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [14]",
+   "name" : "char [14]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3513",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [15]",
+   "name" : "char [15]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3612",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3498",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [17]",
+   "name" : "char [17]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3516",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [18]",
+   "name" : "char [18]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3501",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [19]",
+   "name" : "char [19]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3532",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [20]",
+   "name" : "char [20]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3510",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [22]",
+   "name" : "char [22]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3535",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [25]",
+   "name" : "char [25]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3525",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [28]",
+   "name" : "char [28]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3547",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [29]",
+   "name" : "char [29]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3522",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [2]",
+   "name" : "char [2]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3473",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [31]",
+   "name" : "char [31]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3507",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3538",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [35]",
+   "name" : "char [35]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3529",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [37]",
+   "name" : "char [37]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3519",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [3]",
+   "name" : "char [3]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3486",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4]",
+   "name" : "char [4]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [5]",
+   "name" : "char [5]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3615",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "char [64]",
    "name" : "char [64]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "type-43",
+   "self_type" : "type-362",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [6]",
+   "name" : "char [6]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3476",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [7]",
+   "name" : "char [7]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3504",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [8]",
+   "name" : "char [8]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3491",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [9]",
+   "name" : "char [9]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3480",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-238",
+   "self_type" : "type-237",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-435",
+   "referenced_type" : "type-146",
+   "self_type" : "type-972",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46,8 +289,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-670",
+   "referenced_type" : "type-146",
+   "self_type" : "type-181",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -55,8 +298,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-102",
-   "self_type" : "type-714",
+   "referenced_type" : "type-44",
+   "self_type" : "type-228",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +312,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1
   },
   {
@@ -79,8 +322,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1
   },
   {
@@ -89,8 +332,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 2
   },
   {
@@ -105,8 +348,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 4
   },
   {
@@ -114,8 +357,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -123,8 +366,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-265",
+   "self_type" : "type-265",
    "size" : 8
   },
   {
@@ -132,8 +375,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 8
   },
   {
@@ -141,8 +384,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 2
   },
   {
@@ -150,8 +393,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 1
   },
   {
@@ -160,8 +403,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -170,8 +413,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4
   },
   {
@@ -180,8 +423,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8
   },
   {
@@ -190,8 +433,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-389",
+   "self_type" : "type-389",
    "size" : 8
   },
   {
@@ -200,15 +443,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108"
+   "referenced_type" : "type-77",
+   "self_type" : "type-77"
   }
  ],
  "elf_functions" :
@@ -219,10 +462,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
   },
   {
@@ -1174,6 +1433,78 @@
    "name" : "_ZN7android4hidl7manager4V1_218BpHwServiceManagerC2ERKNS_2spINS_8hardware7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE"
   },
   {
@@ -1204,6 +1535,36 @@
    "name" : "_ZN7android8hardware10HidlMemoryD2Ev"
   },
   {
+   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD2Ev"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
@@ -1220,6 +1581,30 @@
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl7manager4V1_215IServiceManagerENS4_18BpHwServiceManagerENS4_18BnHwServiceManagerEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware11hidl_handle10freeHandleEv"
   },
   {
@@ -1331,18 +1716,243 @@
    "name" : "_ZN7android8hardware11hidl_stringaSERKS1_"
   },
   {
+   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEm"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEmPm"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEmb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC1Em"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC2Em"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_6StatusEPNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhmPKymPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEl"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
    "name" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware14readFromParcelERKNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_"
   },
   {
@@ -1355,9 +1965,45 @@
    "name" : "_ZN7android8hardware16setRequestingSidERKNS_2spINS_4hidl4base4V1_05IBaseEEEb"
   },
   {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android8hardware17joinRpcThreadpoolEv"
   },
   {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE"
   },
   {
@@ -1376,6 +2022,9 @@
    "name" : "_ZN7android8hardware20LazyServiceRegistrarC2Ev"
   },
   {
+   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware21defaultServiceManagerEv"
   },
   {
@@ -1442,6 +2091,184 @@
    "name" : "_ZN7android8hardware31setProcessHidlReturnRestrictionENS0_21HidlReturnRestrictionE"
   },
   {
+   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt64El"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11finishWriteEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11setDataSizeEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvmPm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint64Em"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12restartWriteEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeInplaceEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writePointerEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13continueWriteEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPmmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhmPKymPFvPS1_S3_mS5_mPvES7_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvmPmmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPmmmmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlemm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPmmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel5writeEPKvm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel6removeEmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel7setDataEPKhm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8growDataEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9initStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware6Status11fromStatusTEi"
   },
   {
@@ -1472,6 +2299,30 @@
    "name" : "_ZN7android8hardware6StatusC2EiiPKc"
   },
   {
+   "name" : "_ZN7android8hardware7HexDumpC1EPKvmm"
+  },
+  {
+   "name" : "_ZN7android8hardware7HexDumpC2EPKvmm"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE"
   },
   {
@@ -1651,12 +2502,75 @@
    "name" : "_ZN7android8hardware7details25registerAsServiceInternalERKNS_2spINS_4hidl4base4V1_05IBaseEEERKNSt3__112basic_stringIcNSA_11char_traitsIcEENSA_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
+  },
+  {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE"
   },
   {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE"
   },
   {
+   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv"
   },
   {
@@ -1678,12 +2592,259 @@
    "name" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv"
   },
   {
+   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64EPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readInplaceEm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPmPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEmPmmmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEmPmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectmjmm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEmm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEmm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPmmmPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEmmPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEmPmmmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebmm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEmmPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4dataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4readEPvm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64EPl"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
+  },
+  {
    "name" : "_ZNK7android8hardware6Status11descriptionEv"
   },
   {
+   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware7details13return_status8assertOkEv"
   },
   {
+   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNKSt3__110__back_refIcE6__execERNS_7__stateIcEE"
   },
@@ -2524,12 +3685,66 @@
    "name" : "_ZTv0_n24_N7android4hidl7manager4V1_218BnHwServiceManagerD1Ev"
   },
   {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD1Ev"
+  },
+  {
    "name" : "_ZTv0_n24_N7android8hardware10HidlMemoryD0Ev"
   },
   {
    "name" : "_ZTv0_n24_N7android8hardware10HidlMemoryD1Ev"
   },
   {
+   "name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
    "name" : "__addtf3"
   },
   {
@@ -2570,6 +3785,18 @@
   },
   {
    "name" : "__unordtf2"
+  },
+  {
+   "name" : "getHWBinderKernelReferences"
+  },
+  {
+   "name" : "printHexData"
+  },
+  {
+   "name" : "printTypeCode"
+  },
+  {
+   "name" : "stringForIndent"
   }
  ],
  "elf_objects" :
@@ -2621,6 +3848,21 @@
    "name" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE"
   },
   {
+   "name" : "_ZN7android8hardware12gTextBuffersE"
+  },
+  {
+   "name" : "_ZN7android8hardware13gProcessMutexE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aerrE"
+  },
+  {
+   "name" : "_ZN7android8hardware4alogE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aoutE"
+  },
+  {
    "name" : "_ZN7android8hardware7details14gServiceSidMapE"
   },
   {
@@ -2636,6 +3878,9 @@
    "name" : "_ZN7android8hardware7details6gBnMapE"
   },
   {
+   "name" : "_ZN7android8hardware8gProcessE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android4hidl4base4V1_06BsBaseE0_NS2_5IBaseE"
   },
@@ -2831,6 +4076,13 @@
    "name" : "_ZTCN7android4hidl7manager4V1_218BpHwServiceManagerE8_NS_8hardware10IInterfaceE"
   },
   {
+   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE0_NS4_5IBaseE"
   },
@@ -2860,6 +4112,9 @@
    "name" : "_ZTCN7android8hardware7details6WaiterE0_NS_4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE0_NS_13basic_istreamIcS2_EE"
   },
@@ -2877,6 +4132,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
   },
   {
@@ -2934,16 +4201,31 @@
    "name" : "_ZTTN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "name" : "_ZTTN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTTN7android8hardware10IInterfaceE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
+   "name" : "_ZTTN7android8hardware12ProcessStateE"
+  },
+  {
    "name" : "_ZTTN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTTN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware7details21ClientCounterCallbackE"
   },
   {
@@ -2951,6 +4233,9 @@
    "name" : "_ZTTN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTTN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE"
   },
@@ -2963,6 +4248,14 @@
    "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
    "name" : "_ZTVN7android4hidl4base4V1_05IBaseE"
   },
   {
@@ -3041,20 +4334,85 @@
    "name" : "_ZTVN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIiEE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTVN7android8hardware10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware10PoolThreadE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10TextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android8hardware12FdTextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware12ProcessStateE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware13LogTextOutputE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android8hardware25PassthroughServiceManagerE"
   },
   {
    "name" : "_ZTVN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTVN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware7details16HidlInstrumentorE"
   },
   {
@@ -3065,6 +4423,9 @@
    "name" : "_ZTVN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTVN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__110__back_refIcEE"
   },
@@ -3150,6 +4511,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -3226,11 +4591,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -3244,11 +4609,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -3262,11 +4627,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -3288,11 +4653,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -3318,11 +4683,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -3340,11 +4705,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -3353,6 +4718,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-14",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -3394,11 +4785,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -3448,11 +4839,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -3474,11 +4865,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -3492,11 +4883,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -3518,11 +4909,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-182",
+   "underlying_type" : "type-146",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3568,11 +4959,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -3622,11 +5013,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -3648,11 +5039,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -3690,11 +5081,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-216",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -3932,11 +5323,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -3962,11 +5353,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -3992,11 +5383,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4034,11 +5425,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_component"
   },
   {
@@ -4072,11 +5463,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_format"
   },
   {
@@ -4098,11 +5489,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -4116,11 +5507,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -4146,11 +5537,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-226",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -4240,11 +5631,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -4282,11 +5673,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -4300,11 +5691,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-224",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -4330,11 +5721,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-221",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -4364,11 +5755,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-698",
-   "self_type" : "type-698",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_transform_t"
   },
   {
@@ -4418,11 +5809,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-696",
-   "self_type" : "type-696",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "log_id"
   }
  ],
@@ -4430,18 +5821,138 @@
  [
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    }
+   ],
+   "referenced_type" : "type-2291",
+   "return_type" : "type-2287",
+   "self_type" : "type-2291",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-693"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2241",
+   "return_type" : "type-29",
+   "self_type" : "type-2241",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (void *)",
    "name" : "int (void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     }
    ],
-   "referenced_type" : "type-729",
-   "return_type" : "type-17",
-   "self_type" : "type-729",
+   "referenced_type" : "type-243",
+   "return_type" : "type-14",
+   "self_type" : "type-243",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2303"
+    }
+   ],
+   "referenced_type" : "type-2302",
+   "return_type" : "type-2303",
+   "self_type" : "type-2302",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-989"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2163",
+   "return_type" : "type-77",
+   "self_type" : "type-2163",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (const void *, void *, void *)",
+   "name" : "void (const void *, void *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2157",
+   "return_type" : "type-77",
+   "self_type" : "type-2157",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (void *, const char *)",
+   "name" : "void (void *, const char *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "referenced_type" : "type-3398",
+   "return_type" : "type-77",
+   "self_type" : "type-3398",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "functions" :
@@ -4453,10 +5964,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-967"
+     "referenced_type" : "type-540"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-449"
+    },
+    {
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-3657",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -4466,29 +5993,77 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-436"
+    },
+    {
+     "referenced_type" : "type-437"
+    }
+   ],
+   "return_type" : "type-439",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-436"
+    },
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-439",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2193"
+    },
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-3571",
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::hidl::base::V1_0::IBase::linkToDeath",
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEm",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4498,13 +6073,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2117"
+     "referenced_type" : "type-2561"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4514,13 +6089,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2118"
+     "referenced_type" : "type-2562"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4530,13 +6105,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4546,13 +6121,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2119"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4562,13 +6137,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2120"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4578,10 +6153,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4591,10 +6166,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4604,10 +6179,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4617,16 +6192,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4635,14 +6210,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4653,13 +6228,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1825"
+     "referenced_type" : "type-2063"
     },
     {
-     "referenced_type" : "type-2123"
+     "referenced_type" : "type-2567"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4669,13 +6244,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1825"
+     "referenced_type" : "type-2063"
     },
     {
-     "referenced_type" : "type-862"
+     "referenced_type" : "type-411"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4685,13 +6260,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1825"
+     "referenced_type" : "type-2063"
     },
     {
-     "referenced_type" : "type-862"
+     "referenced_type" : "type-411"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4700,19 +6275,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2126"
+     "referenced_type" : "type-2570"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4722,27 +6297,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2127"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4751,19 +6326,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2128"
+     "referenced_type" : "type-2572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4774,13 +6349,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2573"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4789,19 +6364,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2130"
+     "referenced_type" : "type-2574"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4810,19 +6385,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2131"
+     "referenced_type" : "type-2575"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4831,19 +6406,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2132"
+     "referenced_type" : "type-2576"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4852,19 +6427,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2133"
+     "referenced_type" : "type-2577"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4873,19 +6448,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2134"
+     "referenced_type" : "type-2578"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4896,10 +6471,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4909,13 +6484,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4925,19 +6500,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-1853"
+     "referenced_type" : "type-2090"
     },
     {
-     "referenced_type" : "type-1853"
+     "referenced_type" : "type-2090"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4947,13 +6522,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4963,19 +6538,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-1853"
+     "referenced_type" : "type-2090"
     },
     {
-     "referenced_type" : "type-1853"
+     "referenced_type" : "type-2090"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4985,10 +6560,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4998,10 +6573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -5011,10 +6586,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -5023,13 +6598,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5038,19 +6613,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5060,16 +6635,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5079,13 +6654,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-2135"
+     "referenced_type" : "type-2579"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5095,13 +6670,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-2136"
+     "referenced_type" : "type-2580"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5111,13 +6686,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5127,13 +6702,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-2137"
+     "referenced_type" : "type-2581"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5142,16 +6717,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-2138"
+     "referenced_type" : "type-2582"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5160,16 +6735,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-2139"
+     "referenced_type" : "type-2583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5179,13 +6754,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-2140"
+     "referenced_type" : "type-2584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5194,16 +6769,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-2141"
+     "referenced_type" : "type-2585"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5213,10 +6788,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5226,10 +6801,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5238,16 +6813,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-2142"
+     "referenced_type" : "type-2586"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5256,13 +6831,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5271,13 +6846,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5287,10 +6862,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5300,16 +6875,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5319,13 +6894,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5335,13 +6910,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5351,14 +6926,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5368,16 +6943,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5387,13 +6962,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1414"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5403,13 +6978,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5419,14 +6994,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5436,13 +7011,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5452,13 +7027,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5468,14 +7043,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5485,13 +7060,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-1039"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5501,10 +7076,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5514,10 +7089,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5526,13 +7101,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5542,10 +7117,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5555,16 +7130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5573,14 +7148,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-944",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5589,14 +7164,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-944",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5607,13 +7182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-917"
     },
     {
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1420"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5623,13 +7198,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-917"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5639,13 +7214,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-917"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5654,19 +7229,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1426"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5676,27 +7251,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1427"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5707,13 +7282,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-1050"
+     "referenced_type" : "type-1428"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5722,19 +7297,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-1429"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5743,19 +7318,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1052"
+     "referenced_type" : "type-1430"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5764,19 +7339,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1053"
+     "referenced_type" : "type-1431"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5785,19 +7360,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1432"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5806,19 +7381,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5829,10 +7404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5841,19 +7416,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5862,19 +7437,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1435"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5884,13 +7459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5900,13 +7475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5916,10 +7491,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5929,10 +7504,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5942,10 +7517,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5954,16 +7529,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5973,16 +7548,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5992,13 +7567,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1059"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6008,13 +7583,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1060"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6024,16 +7599,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-764",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6043,13 +7618,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6059,13 +7634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6074,16 +7649,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1440"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6093,16 +7668,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1063"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6111,19 +7686,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-764",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6133,13 +7708,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1064"
+     "referenced_type" : "type-1442"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6148,19 +7723,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1065"
+     "referenced_type" : "type-1443"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6170,10 +7745,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6183,10 +7758,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6196,19 +7771,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6218,16 +7793,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6236,22 +7811,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6260,19 +7835,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6282,16 +7857,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6301,16 +7876,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6320,13 +7895,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1066"
+     "referenced_type" : "type-1444"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6336,10 +7911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6349,16 +7924,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6367,19 +7942,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6388,19 +7963,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6410,13 +7985,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1067"
+     "referenced_type" : "type-1445"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6426,13 +8001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6442,13 +8017,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6458,14 +8033,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6475,16 +8050,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6494,13 +8069,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6510,13 +8085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1069"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6526,14 +8101,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6543,13 +8118,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6559,13 +8134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1070"
+     "referenced_type" : "type-1448"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6575,14 +8150,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6592,13 +8167,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1071"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6608,10 +8183,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6621,10 +8196,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6633,13 +8208,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6649,10 +8224,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6662,16 +8237,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6680,14 +8255,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1053",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6696,14 +8271,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1053",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6714,13 +8289,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1045"
     },
     {
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1452"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6730,13 +8305,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1045"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-546"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6746,13 +8321,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1045"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-546"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6761,19 +8336,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1033"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6782,19 +8357,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1033"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6804,27 +8379,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1086"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1087"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1077"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6835,13 +8410,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     },
     {
-     "referenced_type" : "type-1078"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6850,19 +8425,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1086"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-1079"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6873,10 +8448,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6886,13 +8461,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6902,13 +8477,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6918,10 +8493,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6931,10 +8506,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6944,10 +8519,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6957,16 +8532,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6976,13 +8551,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-1080"
+     "referenced_type" : "type-1458"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6992,13 +8567,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-1081"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7008,13 +8583,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7024,13 +8599,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-1082"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7040,19 +8615,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7062,13 +8637,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-1083"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7077,22 +8652,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-1048"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7102,10 +8677,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7115,10 +8690,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7128,10 +8703,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7141,16 +8716,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7160,13 +8735,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7176,13 +8751,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7192,14 +8767,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7209,16 +8784,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7228,13 +8803,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-1084"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7244,13 +8819,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-1085"
+     "referenced_type" : "type-1463"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7260,14 +8835,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7277,13 +8852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7293,13 +8868,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-1086"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7309,14 +8884,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7326,13 +8901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-1087"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7342,10 +8917,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7355,10 +8930,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7367,13 +8942,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7383,10 +8958,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7396,16 +8971,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7414,14 +8989,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7430,14 +9005,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7446,14 +9021,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-717"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7464,13 +9039,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1099"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7480,13 +9055,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1099"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7496,13 +9071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1099"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7512,27 +9087,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1144"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1145"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1474"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7543,13 +9118,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1475"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7558,19 +9133,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1144"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1145"
     },
     {
-     "referenced_type" : "type-1098"
+     "referenced_type" : "type-1476"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7581,10 +9156,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7594,13 +9169,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-717"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7610,13 +9185,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-717"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7626,10 +9201,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7639,10 +9214,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7652,10 +9227,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7665,16 +9240,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7684,13 +9259,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1477"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7700,13 +9275,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1478"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7716,16 +9291,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-764",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7735,13 +9310,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7751,13 +9326,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1479"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7767,16 +9342,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-1480"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7786,13 +9361,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1481"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7802,10 +9377,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7815,10 +9390,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7828,19 +9403,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7850,16 +9425,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7869,19 +9444,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7890,22 +9465,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-1103"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7915,16 +9490,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7934,16 +9509,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7953,13 +9528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1482"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7969,10 +9544,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7982,16 +9557,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8001,13 +9576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1483"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8017,13 +9592,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8033,13 +9608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8049,14 +9624,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8066,16 +9641,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8085,13 +9660,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-2143"
+     "referenced_type" : "type-2587"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8101,13 +9676,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-2144"
+     "referenced_type" : "type-2588"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8117,14 +9692,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8134,13 +9709,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8150,13 +9725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-2145"
+     "referenced_type" : "type-2589"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8166,14 +9741,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8183,13 +9758,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-2146"
+     "referenced_type" : "type-2590"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8199,10 +9774,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8212,10 +9787,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8224,13 +9799,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8240,10 +9815,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8253,16 +9828,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8271,14 +9846,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1715",
+   "return_type" : "type-1945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8287,14 +9862,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1715",
+   "return_type" : "type-1945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8304,14 +9879,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8321,16 +9896,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8340,13 +9915,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-2147"
+     "referenced_type" : "type-2591"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8356,13 +9931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-2148"
+     "referenced_type" : "type-2592"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8372,14 +9947,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8389,13 +9964,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8405,13 +9980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-2149"
+     "referenced_type" : "type-2593"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8421,14 +9996,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8438,13 +10013,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-2150"
+     "referenced_type" : "type-2594"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8454,10 +10029,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8467,10 +10042,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8479,13 +10054,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8495,10 +10070,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8508,16 +10083,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8526,14 +10101,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8542,14 +10117,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8558,14 +10133,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-717"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8574,14 +10149,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-726"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8592,13 +10167,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1705"
+     "referenced_type" : "type-1929"
     },
     {
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2597"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8608,13 +10183,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1705"
+     "referenced_type" : "type-1929"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-554"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8624,13 +10199,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1705"
+     "referenced_type" : "type-1929"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-554"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8641,13 +10216,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-2004"
     },
     {
-     "referenced_type" : "type-2158"
+     "referenced_type" : "type-2602"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8657,13 +10232,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-2004"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-541"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8673,13 +10248,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-2004"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-541"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8689,27 +10264,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1755"
+     "referenced_type" : "type-1986"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2165"
+     "referenced_type" : "type-2609"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8720,13 +10295,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     },
     {
-     "referenced_type" : "type-2166"
+     "referenced_type" : "type-2610"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8735,19 +10310,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1755"
+     "referenced_type" : "type-1986"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
-     "referenced_type" : "type-2167"
+     "referenced_type" : "type-2611"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8758,10 +10333,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8771,13 +10346,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8787,13 +10362,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8803,10 +10378,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8816,10 +10391,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8829,10 +10404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8842,27 +10417,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2168"
+     "referenced_type" : "type-2612"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8873,13 +10448,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2613"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8888,19 +10463,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2170"
+     "referenced_type" : "type-2614"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8909,19 +10484,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2171"
+     "referenced_type" : "type-2615"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8930,19 +10505,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2616"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8951,19 +10526,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2173"
+     "referenced_type" : "type-2617"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8972,19 +10547,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2174"
+     "referenced_type" : "type-2618"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8995,10 +10570,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9008,13 +10583,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-726"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9024,13 +10599,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-726"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9040,10 +10615,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9053,10 +10628,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9066,10 +10641,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9079,16 +10654,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9098,13 +10673,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2175"
+     "referenced_type" : "type-2619"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9114,13 +10689,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2176"
+     "referenced_type" : "type-2620"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9130,13 +10705,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9146,13 +10721,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2177"
+     "referenced_type" : "type-2621"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9161,19 +10736,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-1935"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9183,13 +10758,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2622"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9199,10 +10774,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9212,10 +10787,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9225,10 +10800,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9238,16 +10813,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9257,16 +10832,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9276,13 +10851,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9292,13 +10867,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9308,16 +10883,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9327,19 +10902,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9349,13 +10924,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2623"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9365,13 +10940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2624"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9381,16 +10956,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-764",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9400,19 +10975,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9422,13 +10997,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9438,13 +11013,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2625"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9454,16 +11029,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2182"
+     "referenced_type" : "type-2626"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9472,22 +11047,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9496,22 +11071,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9521,13 +11096,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2183"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9537,10 +11112,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9550,10 +11125,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9563,22 +11138,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9588,16 +11163,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2628"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9607,19 +11182,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9629,16 +11204,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9648,16 +11223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9667,19 +11242,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9688,25 +11263,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9715,19 +11290,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2185"
+     "referenced_type" : "type-2629"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9736,19 +11311,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9758,16 +11333,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9777,16 +11352,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9796,13 +11371,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2186"
+     "referenced_type" : "type-2630"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9812,10 +11387,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9825,16 +11400,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9844,13 +11419,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2187"
+     "referenced_type" : "type-2631"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9860,13 +11435,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9876,25 +11451,435 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-2218"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-2146",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::sendObituary",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-2172"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-905"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-2227"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2632"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::HidlMemory::getInstance",
    "linker_set_key" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-65"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9903,10 +11888,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9915,16 +11900,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9935,19 +11920,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9958,10 +11943,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9972,19 +11957,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9995,10 +11980,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10008,10 +11993,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10021,10 +12006,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10034,24 +12019,155 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3411"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3406"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::fromBinder",
    "linker_set_key" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-35", "type-373", "type-229" ]
+   "template_args" : [ "type-302", "type-369", "type-299" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10059,12 +12175,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-148", "type-249", "type-247" ]
+   "template_args" : [ "type-496", "type-821", "type-819" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10072,12 +12188,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-156", "type-279", "type-276" ]
+   "template_args" : [ "type-499", "type-847", "type-844" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10085,12 +12201,139 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-129", "type-130", "type-228" ]
+   "template_args" : [ "type-518", "type-727", "type-802" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "access" : "private",
@@ -10100,10 +12343,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10113,17 +12356,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10133,13 +12376,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10149,13 +12392,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10165,13 +12408,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10181,10 +12424,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10194,13 +12437,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10210,13 +12453,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10226,13 +12469,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10242,10 +12485,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10255,10 +12498,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10268,10 +12511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10281,13 +12524,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-88",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10297,13 +12540,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-88",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10313,13 +12556,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-88",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10329,16 +12572,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10348,10 +12591,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10362,16 +12605,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10382,13 +12625,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10398,13 +12641,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10414,13 +12657,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10430,16 +12673,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10449,13 +12692,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10465,13 +12708,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10481,10 +12724,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10494,13 +12737,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10510,13 +12753,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10526,16 +12769,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10545,13 +12788,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10561,13 +12804,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10577,10 +12820,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10590,10 +12833,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10603,10 +12846,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10616,13 +12859,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10632,13 +12875,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10648,13 +12891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10664,28 +12907,437 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
+   "return_type" : "type-445",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMaxThreads",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::startThreadPool",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEm",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-445",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-693"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-3623",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setCallRestriction",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getKernelReferences",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEmPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::becomeContextManager",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2243"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-165",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-2194",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEmb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::self",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
+   "return_type" : "type-445",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Em",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Em",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "function_name" : "android::hardware::writeToParcel",
    "linker_set_key" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-787"
+     "referenced_type" : "type-321"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10694,28 +13346,721 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhmPKymPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-989"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
+   "return_type" : "type-3449",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::clearCaller",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::stopProcess",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setupPolling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-476"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::flushCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearLastError",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::executeCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-476"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-3455"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-426"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-476"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEl",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-265"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::self",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
+   "return_type" : "type-3449",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::process",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-445",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::shutdown",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::transact",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::sendReply",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
    "function_name" : "android::hardware::readFromParcel",
    "linker_set_key" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10724,31 +14069,49 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-266",
+   "return_type" : "type-72",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::release_object",
+   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3431"
+    },
+    {
+     "referenced_type" : "type-3585"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::interfacesEqual",
    "linker_set_key" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_",
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::handleBinderPoll",
    "linker_set_key" : "_ZN7android8hardware16handleBinderPollEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10757,37 +14120,174 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
+   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
+   "return_type" : "type-2318",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::print",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "referenced_type" : "type-41"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::addPostCommandTask",
    "linker_set_key" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-324"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::setupBinderPolling",
    "linker_set_key" : "_ZN7android8hardware18setupBinderPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10796,10 +14296,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10809,17 +14309,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-931"
+     "referenced_type" : "type-487"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-490"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10829,10 +14329,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-931"
+     "referenced_type" : "type-487"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10842,16 +14342,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-931"
+     "referenced_type" : "type-487"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10860,22 +14360,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::setupTransportPolling",
    "linker_set_key" : "_ZN7android8hardware21setupTransportPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10884,19 +14384,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10905,19 +14405,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10926,19 +14426,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10947,13 +14447,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10962,19 +14462,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10983,19 +14483,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11004,19 +14504,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11025,28 +14525,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-72",
+   "return_type" : "type-384",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11056,13 +14556,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-315"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11072,10 +14572,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
-   "return_type" : "type-359",
+   "return_type" : "type-307",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11085,19 +14585,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11107,19 +14607,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11128,25 +14628,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11155,22 +14655,950 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-119"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::Parcel::writeFloat",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-238"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-151"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64El",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-265"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::finishWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvmPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeDouble",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-6"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeObject",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-3585"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3903" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-71"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Em",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::restartWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeCString",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInplace",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::writePointer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::continueWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-288"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-3582"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUnpadded",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::acquireObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::freeDataNoInit",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::releaseObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPmmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataCapacity",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeWeakBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-3566"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeStrongBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhmPKymPFvPS1_S3_mS5_mPvES7_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-989"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-2162"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvmPmmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
+   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::incrementNumReferences",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPmmmmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
+   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlemm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPmmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::write",
+   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::remove",
+   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-989"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::freeData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::growData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setError",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::initState",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBool",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-484"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::fromStatusT",
    "linker_set_key" : "_ZN7android8hardware6Status11fromStatusTEi",
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11180,16 +15608,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11199,13 +15627,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11214,10 +15642,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11226,19 +15654,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "function_name" : "android::hardware::Status::ok",
    "linker_set_key" : "_ZN7android8hardware6Status2okEv",
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11249,16 +15677,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11269,19 +15697,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11292,16 +15720,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11312,35 +15740,162 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2298"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2298"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-2143",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-2146",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::TaskRunner::push",
    "linker_set_key" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-249"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11350,13 +15905,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11366,10 +15921,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11379,10 +15934,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11392,10 +15947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11405,16 +15960,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "function_name" : "android::hardware::details::debuggable",
    "linker_set_key" : "_ZN7android8hardware7details10debuggableEv",
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11423,18 +15978,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-944",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-114", "type-35", "type-261" ]
+   "template_args" : [ "type-505", "type-302", "type-829" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11442,18 +15997,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1053",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-148", "type-35", "type-249" ]
+   "template_args" : [ "type-496", "type-302", "type-821" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11461,18 +16016,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-35", "type-270" ]
+   "template_args" : [ "type-515", "type-302", "type-838" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11480,18 +16035,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-114", "type-270" ]
+   "template_args" : [ "type-515", "type-505", "type-838" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11499,18 +16054,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1715",
+   "return_type" : "type-1945",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-156", "type-35", "type-279" ]
+   "template_args" : [ "type-499", "type-302", "type-847" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11518,18 +16073,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-35", "type-130" ]
+   "template_args" : [ "type-518", "type-302", "type-727" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11537,18 +16092,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-114", "type-130" ]
+   "template_args" : [ "type-518", "type-505", "type-727" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11556,18 +16111,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-113", "type-130" ]
+   "template_args" : [ "type-518", "type-515", "type-727" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -11575,10 +16130,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-1120",
+   "return_type" : "type-1490",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -11588,10 +16143,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11601,10 +16156,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11614,13 +16169,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     },
     {
-     "referenced_type" : "type-452"
+     "referenced_type" : "type-114"
     }
    ],
-   "return_type" : "type-694",
+   "return_type" : "type-206",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11629,10 +16184,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11641,12 +16196,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-35", "type-108" ]
+   "template_args" : [ "type-302", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11654,12 +16209,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-148", "type-108" ]
+   "template_args" : [ "type-496", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11667,12 +16222,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-156", "type-108" ]
+   "template_args" : [ "type-499", "type-77" ]
   },
   {
    "access" : "protected",
@@ -11682,13 +16237,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-142"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11699,14 +16254,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11717,13 +16272,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11733,16 +16288,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11752,16 +16307,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11771,10 +16326,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11784,10 +16339,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11797,10 +16352,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11809,23 +16364,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
    "function_name" : "android::hardware::details::getPidIfSharable",
    "linker_set_key" : "_ZN7android8hardware7details16getPidIfSharableEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -11834,19 +16389,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::details::getVndkVersionStr",
    "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv",
-   "return_type" : "type-1121",
+   "return_type" : "type-630",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11855,18 +16410,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-261", "type-114", "type-108", "type-108" ]
+   "template_args" : [ "type-829", "type-505", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11874,18 +16429,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-249", "type-148", "type-108", "type-108" ]
+   "template_args" : [ "type-821", "type-496", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11893,18 +16448,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-270", "type-113", "type-108", "type-108" ]
+   "template_args" : [ "type-838", "type-515", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11912,18 +16467,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-279", "type-156", "type-108", "type-108" ]
+   "template_args" : [ "type-847", "type-499", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11931,29 +16486,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-130", "type-129", "type-108", "type-108" ]
+   "template_args" : [ "type-727", "type-518", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-320",
+   "return_type" : "type-883",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-326",
+   "return_type" : "type-884",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -11962,19 +16517,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11983,10 +16538,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -11995,10 +16550,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -12007,28 +16562,363 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::onTransact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2633"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-2170"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-2143",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-2172"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-905"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-2175",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2634"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "referenced_type" : "type-3716"
+    }
+   ],
+   "return_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "referenced_type" : "type-3715"
+    }
+   ],
+   "return_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::operator<<",
    "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-58"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-191",
+   "return_type" : "type-58",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12037,26 +16927,58 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-692"
+     "referenced_type" : "type-204"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     }
    ],
-   "return_type" : "type-692",
+   "return_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::BpHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2185"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2238"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::hidl_handle::getNativeHandle",
    "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12066,10 +16988,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12079,10 +17001,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12092,10 +17014,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-16",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12105,10 +17027,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-100",
+   "return_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12118,10 +17040,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12131,37 +17053,1519 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-1136",
+   "return_type" : "type-642",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::isContextManager",
+   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3664"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isServingCall",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
+   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2321"
+    }
+   ],
+   "return_type" : "type-2282",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::clearCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::errorCheck",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::findBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3594"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3593"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-6",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-3597",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3904" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3589"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3590"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::scanForFds",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcDataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readCString",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-78",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::updateCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataCapacity",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::objectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-297"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcBufferSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPmPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3598"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readWeakBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-2194",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::quickFindBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::enforceInterface",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-436"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEmPmmmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEmPmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::verifyBufferObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectmjmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3602"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16Inplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-288",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferChild",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferParent",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPmmmPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3598"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3599"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEmmPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3599"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-436"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEmPmmmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3599"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3599"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEmmPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3599"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::data",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-989",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::read",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::print",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcData",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::objects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-2164",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3587"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataAvail",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3592"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-238",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3588"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-476"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPl",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3591"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-231"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::description",
    "linker_set_key" : "_ZNK7android8hardware6Status11descriptionEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-111"
     }
    ],
-   "return_type" : "type-1137",
+   "return_type" : "type-643",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::IBinder::checkSubclass",
+   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2142"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::return_status::assertOk",
    "linker_set_key" : "_ZNK7android8hardware7details13return_status8assertOkEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-118"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2174"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::getHWBinderKernelReferences",
+   "linker_set_key" : "getHWBinderKernelReferences",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printHexData",
+   "linker_set_key" : "printHexData",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-14"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3399"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printTypeCode",
+   "linker_set_key" : "printTypeCode",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3399"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::stringForIndent",
+   "linker_set_key" : "stringForIndent",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "global_vars" :
@@ -12169,80 +18573,116 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_020IServiceNotification10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceNotification::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_115IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_1::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IClientCallback10descriptorE",
    "name" : "android::hidl::manager::V1_2::IClientCallback::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_2::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_handle21kOffsetOfNativeHandleE",
    "name" : "android::hardware::hidl_handle::kOffsetOfNativeHandle",
-   "referenced_type" : "type-678",
+   "referenced_type" : "type-190",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-678",
+   "referenced_type" : "type-190",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-678",
+   "referenced_type" : "type-190",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-678",
+   "referenced_type" : "type-190",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
+   "name" : "android::hardware::gTextBuffers",
+   "referenced_type" : "type-2324",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
+   "name" : "android::hardware::gProcessMutex",
+   "referenced_type" : "type-394",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aerrE",
+   "name" : "android::hardware::aerr",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4alogE",
+   "name" : "android::hardware::alog",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aoutE",
+   "name" : "android::hardware::aout",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-1139",
+   "referenced_type" : "type-645",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-1140",
+   "referenced_type" : "type-646",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-822",
+   "referenced_type" : "type-361",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware8gProcessE",
+   "name" : "android::hardware::gProcess",
+   "referenced_type" : "type-2635",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
   }
  ],
  "lvalue_reference_types" :
@@ -12251,8 +18691,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-841",
-   "self_type" : "type-845",
+   "referenced_type" : "type-390",
+   "self_type" : "type-394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12260,17 +18700,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-851",
-   "self_type" : "type-856",
+   "referenced_type" : "type-400",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::RefBase *const &",
+   "name" : "android::RefBase *const &",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3443",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_type *const &",
+   "name" : "android::RefBase::weakref_type *const &",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3439",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-773",
+   "referenced_type" : "type-287",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12278,17 +18736,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-659",
+   "referenced_type" : "type-165",
+   "self_type" : "type-170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *const &",
+   "name" : "android::hardware::BHwBinder *const &",
+   "referenced_type" : "type-3416",
+   "self_type" : "type-3435",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
-   "referenced_type" : "type-30",
-   "self_type" : "type-50",
+   "referenced_type" : "type-663",
+   "self_type" : "type-675",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12296,8 +18763,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
-   "referenced_type" : "type-42",
-   "self_type" : "type-53",
+   "referenced_type" : "type-669",
+   "self_type" : "type-678",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12305,8 +18772,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-588",
+   "self_type" : "type-884",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -12314,17 +18781,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-347",
+   "self_type" : "type-883",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::HexDump &",
+   "name" : "android::hardware::HexDump &",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2299",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1220",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12332,8 +18808,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12341,17 +18817,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel &",
+   "name" : "android::hardware::Parcel &",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3696",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
+   "name" : "android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3646",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
-   "referenced_type" : "type-180",
-   "self_type" : "type-185",
+   "referenced_type" : "type-764",
+   "self_type" : "type-767",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12359,8 +18853,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-172",
-   "self_type" : "type-176",
+   "referenced_type" : "type-757",
+   "self_type" : "type-760",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12368,8 +18862,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-405",
+   "referenced_type" : "type-944",
+   "self_type" : "type-947",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12377,8 +18871,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1056",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12386,8 +18880,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
-   "referenced_type" : "type-615",
-   "self_type" : "type-618",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1113",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12395,8 +18889,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1948",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12404,8 +18898,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2018",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12413,8 +18907,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-411",
-   "self_type" : "type-739",
+   "referenced_type" : "type-250",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12422,8 +18916,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-497",
+   "referenced_type" : "type-120",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12431,17 +18925,71 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-106",
-   "self_type" : "type-418",
+   "referenced_type" : "type-103",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2287",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3304",
+   "self_type" : "type-3303",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3345",
+   "self_type" : "type-3344",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3659",
+   "self_type" : "type-3658",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-512",
+   "referenced_type" : "type-968",
+   "self_type" : "type-1035",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12449,8 +18997,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-508",
+   "referenced_type" : "type-572",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12458,8 +19006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-236",
+   "referenced_type" : "type-792",
+   "self_type" : "type-808",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12467,8 +19015,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &",
    "name" : "android::hardware::details::hidl_pointer<const char> &",
-   "referenced_type" : "type-98",
-   "self_type" : "type-317",
+   "referenced_type" : "type-39",
+   "self_type" : "type-86",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12476,8 +19024,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-12",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-9",
+   "self_type" : "type-587",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12485,8 +19033,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-194",
-   "self_type" : "type-200",
+   "referenced_type" : "type-474",
+   "self_type" : "type-779",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12494,8 +19042,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &",
    "name" : "android::hardware::details::return_status &",
-   "referenced_type" : "type-105",
-   "self_type" : "type-694",
+   "referenced_type" : "type-112",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12503,8 +19051,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-516",
+   "referenced_type" : "type-971",
+   "self_type" : "type-1038",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12512,8 +19060,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &",
    "name" : "android::hardware::hidl_handle &",
-   "referenced_type" : "type-77",
-   "self_type" : "type-88",
+   "referenced_type" : "type-28",
+   "self_type" : "type-34",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12521,8 +19069,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-203",
-   "self_type" : "type-226",
+   "referenced_type" : "type-60",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12530,8 +19078,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-190",
+   "referenced_type" : "type-38",
+   "self_type" : "type-57",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12539,8 +19087,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-439",
+   "referenced_type" : "type-967",
+   "self_type" : "type-976",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12548,8 +19096,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-429",
+   "referenced_type" : "type-571",
+   "self_type" : "type-966",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12557,8 +19105,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-991",
-   "self_type" : "type-995",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12566,8 +19114,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-206",
-   "self_type" : "type-208",
+   "referenced_type" : "type-473",
+   "self_type" : "type-785",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12575,17 +19123,62 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-241",
+   "referenced_type" : "type-503",
+   "self_type" : "type-813",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3632",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2209",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
+   "name" : "android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3445",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2309",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-72",
-   "self_type" : "type-889",
+   "referenced_type" : "type-384",
+   "self_type" : "type-439",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
+   "name" : "android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-445",
+   "self_type" : "type-3657",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12593,8 +19186,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-161",
+   "referenced_type" : "type-743",
+   "self_type" : "type-746",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12602,8 +19195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-356",
-   "self_type" : "type-399",
+   "referenced_type" : "type-907",
+   "self_type" : "type-942",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12611,8 +19204,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-300",
+   "self_type" : "type-612",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12620,8 +19213,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-258",
-   "self_type" : "type-392",
+   "referenced_type" : "type-527",
+   "self_type" : "type-935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12629,8 +19222,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-395",
+   "referenced_type" : "type-543",
+   "self_type" : "type-938",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12638,8 +19231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-124",
+   "referenced_type" : "type-532",
+   "self_type" : "type-725",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12647,8 +19240,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-549",
+   "self_type" : "type-1943",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12656,8 +19249,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-127",
-   "self_type" : "type-140",
+   "referenced_type" : "type-538",
+   "self_type" : "type-733",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12665,8 +19258,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-797",
-   "self_type" : "type-875",
+   "referenced_type" : "type-331",
+   "self_type" : "type-425",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2216",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
+   "name" : "android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-3571",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12674,17 +19285,269 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-33",
-   "self_type" : "type-865",
+   "referenced_type" : "type-309",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "char *const &",
+   "name" : "char *const &",
+   "referenced_type" : "type-3606",
+   "self_type" : "type-3607",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[10]",
+   "name" : "char const (&)[10]",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3470",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[11]",
+   "name" : "char const (&)[11]",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3495",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[12]",
+   "name" : "char const (&)[12]",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3466",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[13]",
+   "name" : "char const (&)[13]",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3462",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[14]",
+   "name" : "char const (&)[14]",
+   "referenced_type" : "type-3512",
+   "self_type" : "type-3514",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[15]",
+   "name" : "char const (&)[15]",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3613",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[16]",
+   "name" : "char const (&)[16]",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[17]",
+   "name" : "char const (&)[17]",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3517",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[18]",
+   "name" : "char const (&)[18]",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3502",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[19]",
+   "name" : "char const (&)[19]",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3533",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[20]",
+   "name" : "char const (&)[20]",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3511",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[22]",
+   "name" : "char const (&)[22]",
+   "referenced_type" : "type-3534",
+   "self_type" : "type-3536",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[25]",
+   "name" : "char const (&)[25]",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[28]",
+   "name" : "char const (&)[28]",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3548",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[29]",
+   "name" : "char const (&)[29]",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[2]",
+   "name" : "char const (&)[2]",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3474",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[31]",
+   "name" : "char const (&)[31]",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3508",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[32]",
+   "name" : "char const (&)[32]",
+   "referenced_type" : "type-3537",
+   "self_type" : "type-3540",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[35]",
+   "name" : "char const (&)[35]",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3530",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[37]",
+   "name" : "char const (&)[37]",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3520",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[3]",
+   "name" : "char const (&)[3]",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3489",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[4]",
+   "name" : "char const (&)[4]",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3610",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[5]",
+   "name" : "char const (&)[5]",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[6]",
+   "name" : "char const (&)[6]",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3478",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[7]",
+   "name" : "char const (&)[7]",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3505",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[8]",
+   "name" : "char const (&)[8]",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3492",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[9]",
+   "name" : "char const (&)[9]",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3481",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-770",
-   "self_type" : "type-772",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12692,35 +19555,44 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-167",
+   "self_type" : "type-169",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1199",
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
+   "name" : "const android::hardware::BpHwBinder::Obituary &",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2227",
    "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2211",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::HexDump &",
+   "name" : "const android::hardware::HexDump &",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-3716",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1086",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12728,8 +19600,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1144",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12737,8 +19609,44 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1782",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1864",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1920",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1986",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -12746,8 +19654,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2039",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12755,8 +19663,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2093",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -12764,8 +19672,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2367",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12773,8 +19690,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-473",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2923",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12782,8 +19699,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-588",
-   "self_type" : "type-590",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3005",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12791,8 +19708,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-646",
-   "self_type" : "type-648",
+   "referenced_type" : "type-3059",
+   "self_type" : "type-3061",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12800,17 +19717,71 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3125",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-316",
+   "self_type" : "type-318",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3176",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3227",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3690",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-998",
+   "self_type" : "type-1000",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
+   "name" : "const android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-3625",
+   "self_type" : "type-3647",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "type-460",
+   "self_type" : "type-951",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12818,8 +19789,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-109",
+   "referenced_type" : "type-714",
+   "self_type" : "type-715",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12827,17 +19798,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-413",
+   "referenced_type" : "type-107",
+   "self_type" : "type-108",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::TypeCode &",
+   "name" : "const android::hardware::TypeCode &",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-3715",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-483",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12845,8 +19825,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-11",
-   "self_type" : "type-76",
+   "referenced_type" : "type-8",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12854,8 +19834,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-492",
+   "self_type" : "type-786",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12863,8 +19843,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-80",
+   "referenced_type" : "type-31",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12872,8 +19852,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-222",
-   "self_type" : "type-223",
+   "referenced_type" : "type-62",
+   "self_type" : "type-63",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12881,8 +19861,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-143",
-   "self_type" : "type-151",
+   "referenced_type" : "type-47",
+   "self_type" : "type-48",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12890,8 +19870,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2096",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12899,8 +19879,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1002",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12908,8 +19888,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-445",
-   "self_type" : "type-477",
+   "referenced_type" : "type-981",
+   "self_type" : "type-1003",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12917,8 +19897,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-996",
-   "self_type" : "type-998",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12926,8 +19906,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-921",
-   "self_type" : "type-923",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12935,8 +19915,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-277",
-   "self_type" : "type-292",
+   "referenced_type" : "type-73",
+   "self_type" : "type-75",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12944,8 +19924,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &",
    "name" : "const android::hidl::base::V1_0::IBase *const &",
-   "referenced_type" : "type-811",
-   "self_type" : "type-812",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12953,26 +19933,134 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-510",
+   "referenced_type" : "type-980",
+   "self_type" : "type-1033",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3622",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2197",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
+   "name" : "const android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2170",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2218",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3290",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2336",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3388",
+   "self_type" : "type-3390",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3397",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-440",
+   "self_type" : "type-693",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
+   "name" : "const android::sp<android::hardware::IInterface> &",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-117",
-   "self_type" : "type-123",
+   "referenced_type" : "type-718",
+   "self_type" : "type-724",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
+   "name" : "const android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-450",
+   "self_type" : "type-3431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12980,8 +20068,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-361",
+   "referenced_type" : "type-906",
+   "self_type" : "type-909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12989,8 +20077,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-80",
+   "self_type" : "type-79",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12998,8 +20086,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
+   "referenced_type" : "type-411",
+   "self_type" : "type-413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13007,8 +20095,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "type-530",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13016,8 +20104,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-546",
+   "self_type" : "type-737",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13025,8 +20113,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "type-535",
+   "self_type" : "type-717",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13034,8 +20122,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-554",
+   "self_type" : "type-741",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13043,8 +20131,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-541",
+   "self_type" : "type-726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13052,8 +20140,53 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-874",
+   "referenced_type" : "type-423",
+   "self_type" : "type-424",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1214",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2364",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3566",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13061,26 +20194,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1196",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1910",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-781",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3660",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13088,8 +20203,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-868",
-   "self_type" : "type-869",
+   "referenced_type" : "type-418",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13097,8 +20212,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-415",
+   "self_type" : "type-689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13106,13 +20221,31 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-905",
-   "self_type" : "type-924",
+   "referenced_type" : "type-456",
+   "self_type" : "type-480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const char &",
+   "name" : "const char &",
+   "referenced_type" : "type-42",
+   "self_type" : "type-2306",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const char *const &",
+   "name" : "const char *const &",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-5",
@@ -13122,10 +20255,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const flat_binder_object &",
+   "name" : "const flat_binder_object &",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3585",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13133,227 +20275,332 @@
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-441",
-   "self_type" : "type-993",
+   "referenced_type" : "type-569",
+   "self_type" : "type-578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1064",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1121",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1197",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1249",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1302",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1372",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1502",
+   "self_type" : "type-1504",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1543",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1611",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1681",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1755",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1897",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1957",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2029",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2075",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1998",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2348",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2451",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-201",
-   "self_type" : "type-204",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2521",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2068",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2645",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-246",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2684",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-272",
+   "self_type" : "type-274",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-419",
-   "self_type" : "type-421",
+   "referenced_type" : "type-2750",
+   "self_type" : "type-2752",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-557",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2784",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-624",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2822",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-751",
-   "self_type" : "type-753",
+   "referenced_type" : "type-2894",
+   "self_type" : "type-2896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-85",
-   "self_type" : "type-87",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2983",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-918",
-   "self_type" : "type-920",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3038",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3096",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3164",
+   "self_type" : "type-3166",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3208",
+   "self_type" : "type-3210",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3259",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3412",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3794",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3864",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-470",
+   "self_type" : "type-472",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-567",
+   "self_type" : "type-570",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-654",
+   "self_type" : "type-656",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-67",
+   "self_type" : "type-69",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-702",
+   "self_type" : "type-704",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-780",
+   "self_type" : "type-782",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-810",
+   "self_type" : "type-818",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-874",
+   "self_type" : "type-876",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-959",
+   "self_type" : "type-961",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-671",
-   "self_type" : "type-673",
+   "referenced_type" : "type-182",
+   "self_type" : "type-184",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13361,8 +20608,8 @@
    "alignment" : 8,
    "linker_set_key" : "const long &",
    "name" : "const long &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-605",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13370,8 +20617,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-981",
+   "referenced_type" : "type-548",
+   "self_type" : "type-561",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13379,8 +20626,8 @@
    "alignment" : 8,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-927",
-   "self_type" : "type-935",
+   "referenced_type" : "type-483",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13388,8 +20635,35 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1008",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1073",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1131",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1244",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13397,44 +20671,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1181",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1152",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1216",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1222",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1315",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13442,8 +20680,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1393",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13451,35 +20689,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1545",
    "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1547",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1618",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1591",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13487,8 +20707,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1630",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1790",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13496,8 +20725,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1851",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13505,8 +20734,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1905",
+   "self_type" : "type-1907",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13514,8 +20743,35 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1968",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2",
+   "self_type" : "type-35",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2044",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2090",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -13523,8 +20779,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1938",
-   "self_type" : "type-1940",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13532,17 +20788,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2464",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13550,8 +20797,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2542",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13559,8 +20806,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2686",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13568,8 +20815,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-2723",
+   "self_type" : "type-2732",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2769",
+   "self_type" : "type-2771",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -13577,8 +20833,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2929",
+   "self_type" : "type-2931",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13586,8 +20842,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-572",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2990",
+   "self_type" : "type-2992",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13595,8 +20851,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3048",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13604,8 +20860,35 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-819",
-   "self_type" : "type-821",
+   "referenced_type" : "type-3105",
+   "self_type" : "type-3107",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3181",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3222",
+   "self_type" : "type-3224",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-358",
+   "self_type" : "type-360",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13613,17 +20896,89 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-932",
-   "self_type" : "type-934",
+   "referenced_type" : "type-3734",
+   "self_type" : "type-3736",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3807",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3883",
+   "self_type" : "type-3885",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-488",
+   "self_type" : "type-490",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-52",
+   "self_type" : "type-54",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-599",
+   "self_type" : "type-601",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-647",
+   "self_type" : "type-706",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-751",
+   "self_type" : "type-761",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-803",
+   "self_type" : "type-805",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1385",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13631,8 +20986,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2534",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13640,8 +20995,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13649,8 +21013,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1237",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13658,8 +21022,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2387",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13667,8 +21031,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-353",
+   "self_type" : "type-352",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
+   "name" : "const std::function<sp<IBinder> (void *)> &",
+   "referenced_type" : "type-3730",
+   "self_type" : "type-3729",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13676,8 +21049,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1186",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13685,8 +21058,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2119",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13694,17 +21067,44 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-733",
-   "self_type" : "type-735",
+   "referenced_type" : "type-247",
+   "self_type" : "type-249",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3253",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3453",
+   "self_type" : "type-3455",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3582",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1619",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13712,8 +21112,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-211",
-   "self_type" : "type-214",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2760",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-787",
+   "self_type" : "type-790",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13721,8 +21130,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1039",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13730,8 +21139,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1089",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13739,8 +21148,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13748,8 +21157,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13757,8 +21166,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13766,8 +21175,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1263",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13775,8 +21184,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1296",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1400",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13784,8 +21193,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13793,8 +21202,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1550",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13802,8 +21211,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13811,8 +21220,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13820,8 +21229,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13829,8 +21238,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13838,8 +21247,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1698",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13847,8 +21256,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13856,8 +21265,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1639",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13865,44 +21274,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1699",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1870",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13919,8 +21292,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13928,8 +21301,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2096",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13937,8 +21310,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13946,8 +21319,161 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2129",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2691",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2720",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2836",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2840",
+   "self_type" : "type-2839",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2960",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3008",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3026",
+   "self_type" : "type-3025",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3065",
+   "self_type" : "type-3064",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3194",
+   "self_type" : "type-3193",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13964,8 +21490,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13973,8 +21499,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-517",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3828",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13982,8 +21508,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13991,8 +21517,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14000,8 +21526,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-613",
-   "self_type" : "type-612",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14009,8 +21535,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
+   "referenced_type" : "type-610",
+   "self_type" : "type-609",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14018,8 +21544,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-804",
-   "self_type" : "type-803",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14027,8 +21553,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14036,8 +21562,44 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-894",
+   "self_type" : "type-893",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-91",
+   "self_type" : "type-90",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14045,17 +21607,26 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-966",
+   "referenced_type" : "type-523",
+   "self_type" : "type-537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const unsigned char *const &",
+   "name" : "const unsigned char *const &",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3542",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-677",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-189",
+   "self_type" : "type-597",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14063,17 +21634,44 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-678",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-190",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const unsigned long *const &",
+   "name" : "const unsigned long *const &",
+   "referenced_type" : "type-3543",
+   "self_type" : "type-3545",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const unsigned long long &",
+   "name" : "const unsigned long long &",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-3467",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-982",
-   "self_type" : "type-986",
+   "referenced_type" : "type-562",
+   "self_type" : "type-566",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const void *const &",
+   "name" : "const void *const &",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14081,8 +21679,8 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-761",
+   "referenced_type" : "type-14",
+   "self_type" : "type-284",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14090,17 +21688,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1173",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14108,8 +21697,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14117,8 +21706,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2022",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14126,8 +21715,26 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "type-205",
+   "self_type" : "type-204",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2744",
+   "self_type" : "type-2743",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14135,19 +21742,91 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3365",
+   "self_type" : "type-3364",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3551",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-946",
+   "referenced_type" : "type-146",
+   "self_type" : "type-508",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *const &",
+   "name" : "void *const &",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3484",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   }
  ],
  "pointer_types" :
@@ -14156,8 +21835,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CallStack *",
    "name" : "android::CallStack *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-687",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14165,8 +21844,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CallStack::StackDeleter *",
    "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-691",
+   "referenced_type" : "type-202",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14174,17 +21853,89 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-847",
-   "self_type" : "type-850",
+   "referenced_type" : "type-396",
+   "self_type" : "type-399",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3447",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-383",
+   "self_type" : "type-3648",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2229",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-841",
-   "self_type" : "type-843",
+   "referenced_type" : "type-390",
+   "self_type" : "type-392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14192,8 +21943,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-844",
-   "self_type" : "type-846",
+   "referenced_type" : "type-393",
+   "self_type" : "type-395",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14201,8 +21952,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-854",
+   "referenced_type" : "type-400",
+   "self_type" : "type-403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14210,8 +21961,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-855",
-   "self_type" : "type-857",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14219,8 +21970,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-859",
-   "self_type" : "type-860",
+   "referenced_type" : "type-408",
+   "self_type" : "type-409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14228,8 +21979,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-66",
+   "referenced_type" : "type-18",
+   "self_type" : "type-25",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase **",
+   "name" : "android::RefBase **",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3415",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase *const *",
+   "name" : "android::RefBase *const *",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3421",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14237,8 +22015,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14246,8 +22024,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14255,8 +22033,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14264,8 +22042,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14273,8 +22051,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14282,8 +22060,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14291,8 +22069,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14300,8 +22078,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14309,8 +22087,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14318,8 +22096,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1749",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14327,8 +22105,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14336,8 +22114,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14345,8 +22123,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14354,8 +22132,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2024",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14363,8 +22141,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2070",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14372,8 +22150,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-21",
+   "self_type" : "type-20",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14381,8 +22159,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1879",
-   "self_type" : "type-1878",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14390,8 +22168,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14399,8 +22177,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14408,8 +22186,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14417,8 +22195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14426,8 +22204,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14435,8 +22213,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14444,8 +22222,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14453,8 +22231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14462,8 +22240,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-267",
+   "self_type" : "type-266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14471,8 +22249,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14480,8 +22258,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "type-2747",
+   "self_type" : "type-2746",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14489,8 +22267,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-912",
+   "referenced_type" : "type-2817",
+   "self_type" : "type-2816",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14498,8 +22276,242 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-984",
-   "self_type" : "type-983",
+   "referenced_type" : "type-2891",
+   "self_type" : "type-2890",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2979",
+   "self_type" : "type-2978",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3034",
+   "self_type" : "type-3033",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3206",
+   "self_type" : "type-3205",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3321",
+   "self_type" : "type-3320",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3370",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3401",
+   "self_type" : "type-3400",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3429",
+   "self_type" : "type-3428",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3699",
+   "self_type" : "type-3698",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3790",
+   "self_type" : "type-3789",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3858",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-699",
+   "self_type" : "type-698",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14507,17 +22519,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-22",
+   "self_type" : "type-308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_type **",
+   "name" : "android::RefBase::weakref_type **",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3414",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_type *const *",
+   "name" : "android::RefBase::weakref_type *const *",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3419",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-23",
+   "referenced_type" : "type-7",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14525,17 +22555,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-501",
-   "self_type" : "type-502",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-376",
+   "self_type" : "type-3639",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2219",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-774",
+   "referenced_type" : "type-287",
+   "self_type" : "type-297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14543,8 +22591,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-660",
+   "referenced_type" : "type-165",
+   "self_type" : "type-171",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14552,17 +22600,125 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::RefBase *> *",
+   "name" : "android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3440",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3436",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::Vector<android::String8> *",
    "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-682",
-   "self_type" : "type-683",
+   "referenced_type" : "type-194",
+   "self_type" : "type-195",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3432",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2150",
+   "self_type" : "type-2149",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2224",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3279",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3456",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-378",
+   "self_type" : "type-3642",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2331",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2329",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14570,8 +22726,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-509",
+   "referenced_type" : "type-126",
+   "self_type" : "type-127",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -14579,6 +22735,24 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1096",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
    "referenced_type" : "type-1226",
    "self_type" : "type-1225",
    "size" : 8,
@@ -14588,8 +22762,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14597,8 +22771,89 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1822",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1927",
+   "self_type" : "type-1926",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2001",
+   "self_type" : "type-2000",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2059",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2143",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2709",
+   "self_type" : "type-2708",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14606,8 +22861,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14615,8 +22870,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14624,8 +22879,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2963",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14633,8 +22888,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1650",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-3016",
+   "self_type" : "type-3015",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14642,8 +22897,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1703",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14651,8 +22906,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14660,8 +22915,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1822",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-3197",
+   "self_type" : "type-3196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14669,8 +22924,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14678,8 +22933,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14687,8 +22942,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14696,35 +22960,143 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "linker_set_key" : "android::hardware::BHwBinder **",
+   "name" : "android::hardware::BHwBinder **",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-3413",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "linker_set_key" : "android::hardware::BHwBinder *const *",
+   "name" : "android::hardware::BHwBinder *const *",
+   "referenced_type" : "type-3416",
+   "self_type" : "type-3417",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-3296",
+   "self_type" : "type-3295",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BpHwBinder *",
+   "name" : "android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2146",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
+   "name" : "android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2201",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2236",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BpHwRefBase *",
+   "name" : "android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2181",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput *",
+   "name" : "android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2317",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-39",
+   "referenced_type" : "type-663",
+   "self_type" : "type-666",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14732,8 +23104,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-46",
+   "referenced_type" : "type-669",
+   "self_type" : "type-672",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14741,8 +23113,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-806",
+   "referenced_type" : "type-326",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14750,8 +23122,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-588",
+   "self_type" : "type-603",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14759,8 +23131,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-825",
+   "referenced_type" : "type-347",
+   "self_type" : "type-365",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14768,17 +23140,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-262",
+   "self_type" : "type-261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::HexDump *",
+   "name" : "android::hardware::HexDump *",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::HidlMemory *",
    "name" : "android::hardware::HidlMemory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14786,8 +23167,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1046",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14795,8 +23176,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1101",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14804,8 +23185,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14813,8 +23194,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14822,8 +23203,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1338",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14831,8 +23212,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1530",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14840,8 +23221,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14849,8 +23230,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14858,8 +23239,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1721",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14867,8 +23248,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1654",
-   "self_type" : "type-1653",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14876,8 +23257,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14885,8 +23266,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14894,8 +23275,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2006",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14903,8 +23284,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14912,8 +23293,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14921,8 +23302,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2036",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2140",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14930,8 +23311,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14939,8 +23320,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14948,8 +23329,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-345",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2553",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14957,8 +23338,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14966,8 +23347,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2808",
+   "self_type" : "type-2807",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14975,8 +23356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14984,8 +23365,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14993,8 +23374,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "type-2967",
+   "self_type" : "type-2966",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15002,150 +23383,69 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-3020",
+   "self_type" : "type-3019",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1643",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1646",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1763",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1766",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-599",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1494",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3073",
+   "self_type" : "type-3072",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1587",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3145",
+   "self_type" : "type-3144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1655",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3200",
+   "self_type" : "type-3199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1709",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3744",
+   "self_type" : "type-3743",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1828",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
    "referenced_type" : "type-386",
    "self_type" : "type-385",
    "size" : 8,
@@ -15153,10 +23453,217 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-614",
+   "self_type" : "type-613",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1092",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1705",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2114",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2192",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3011",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3013",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3134",
+   "self_type" : "type-3133",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3137",
+   "self_type" : "type-3136",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1048",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15164,17 +23671,152 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1827",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2067",
+   "self_type" : "type-2066",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-3408",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2969",
+   "self_type" : "type-2968",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3022",
+   "self_type" : "type-3021",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3147",
+   "self_type" : "type-3146",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IPCThreadState *",
+   "name" : "android::hardware::IPCThreadState *",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-3449",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-931",
+   "referenced_type" : "type-485",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -15182,8 +23824,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15191,17 +23833,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1543",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15209,8 +23842,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15218,8 +23851,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1865",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15227,8 +23896,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2040",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15236,8 +23905,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15245,8 +23914,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15254,8 +23932,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15263,8 +23941,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3006",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15272,8 +23950,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-3063",
+   "self_type" : "type-3062",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15281,8 +23959,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3126",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15290,8 +24004,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1558",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15299,8 +24013,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-2700",
+   "self_type" : "type-2699",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::PassthroughServiceManager *",
+   "name" : "android::hardware::PassthroughServiceManager *",
+   "referenced_type" : "type-721",
+   "self_type" : "type-720",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::PoolThread *",
+   "name" : "android::hardware::PoolThread *",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15308,8 +24040,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15317,8 +24049,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1105",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15326,8 +24058,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15335,8 +24067,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15344,8 +24076,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15353,8 +24085,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1829",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15362,8 +24094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15371,8 +24103,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1937",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15380,8 +24112,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15389,8 +24121,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15398,8 +24130,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2254",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15407,8 +24139,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15416,8 +24148,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15425,17 +24157,107 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-2868",
+   "self_type" : "type-2867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2971",
+   "self_type" : "type-2970",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3023",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3150",
+   "self_type" : "type-3149",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3782",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
+   "name" : "android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3623",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-764",
+   "self_type" : "type-765",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15443,8 +24265,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-174",
+   "referenced_type" : "type-757",
+   "self_type" : "type-758",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15452,8 +24274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-944",
+   "self_type" : "type-945",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15461,8 +24283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1054",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15470,8 +24292,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1111",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15479,8 +24301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1946",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15488,8 +24310,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2016",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15497,8 +24319,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-737",
+   "referenced_type" : "type-250",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15506,8 +24328,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-489",
+   "referenced_type" : "type-120",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15515,17 +24337,53 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-408",
+   "referenced_type" : "type-103",
+   "self_type" : "type-106",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2292",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput *",
+   "name" : "android::hardware::TextOutput *",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-3712",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
+   "name" : "android::hardware::TextOutput::Bundle *",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TypeCode *",
+   "name" : "android::hardware::TypeCode *",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2294",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15533,8 +24391,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2054",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2507",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15542,8 +24400,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-974",
-   "self_type" : "type-973",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
+   "name" : "android::hardware::details::ClientCounterCallback *",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15551,8 +24418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-51",
+   "referenced_type" : "type-673",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15560,8 +24427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-54",
+   "referenced_type" : "type-677",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15569,8 +24436,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-361",
+   "self_type" : "type-363",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15578,8 +24445,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-602",
+   "self_type" : "type-604",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15587,8 +24454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-827",
+   "referenced_type" : "type-364",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15596,8 +24463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-999",
+   "referenced_type" : "type-128",
+   "self_type" : "type-584",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15605,8 +24472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::TaskRunner *",
    "name" : "android::hardware::details::TaskRunner *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-726",
+   "referenced_type" : "type-209",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -15614,8 +24481,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1571",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15623,8 +24490,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-149",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2712",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-739",
+   "self_type" : "type-738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15632,8 +24508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-511",
+   "referenced_type" : "type-968",
+   "self_type" : "type-1034",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15641,8 +24517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-507",
+   "referenced_type" : "type-572",
+   "self_type" : "type-1030",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15650,8 +24526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-235",
+   "referenced_type" : "type-792",
+   "self_type" : "type-807",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15659,8 +24535,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> *",
    "name" : "android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-314",
+   "referenced_type" : "type-39",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15668,8 +24544,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-937",
+   "referenced_type" : "type-9",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15677,8 +24553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-474",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15686,8 +24562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-442",
+   "referenced_type" : "type-112",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15695,8 +24571,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "type-971",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15704,8 +24580,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15713,8 +24589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-83",
+   "self_type" : "type-82",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15722,8 +24598,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-78",
+   "referenced_type" : "type-28",
+   "self_type" : "type-30",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15731,8 +24607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-213",
+   "referenced_type" : "type-60",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15740,8 +24616,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-122",
+   "referenced_type" : "type-38",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15749,8 +24625,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-436",
+   "referenced_type" : "type-967",
+   "self_type" : "type-973",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15758,8 +24634,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-571",
+   "self_type" : "type-963",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15767,8 +24643,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-221",
+   "referenced_type" : "type-791",
+   "self_type" : "type-795",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15776,8 +24652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-994",
+   "referenced_type" : "type-576",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15785,8 +24661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-205",
+   "referenced_type" : "type-473",
+   "self_type" : "type-783",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15794,8 +24670,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-266",
+   "referenced_type" : "type-70",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15803,8 +24679,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-776",
+   "referenced_type" : "type-299",
+   "self_type" : "type-304",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15812,8 +24688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "type-369",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15821,8 +24697,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2063",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15830,8 +24706,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15839,8 +24715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-260",
+   "referenced_type" : "type-827",
+   "self_type" : "type-828",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
@@ -15848,8 +24724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-247",
-   "self_type" : "type-248",
+   "referenced_type" : "type-819",
+   "self_type" : "type-820",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15857,8 +24733,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-371",
+   "referenced_type" : "type-829",
+   "self_type" : "type-918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15866,8 +24742,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-394",
+   "referenced_type" : "type-821",
+   "self_type" : "type-937",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15875,8 +24751,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-370",
+   "referenced_type" : "type-916",
+   "self_type" : "type-917",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15884,8 +24760,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-528",
-   "self_type" : "type-529",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1045",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15893,8 +24769,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-259",
+   "referenced_type" : "type-505",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15902,8 +24778,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "type-503",
+   "self_type" : "type-794",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15911,8 +24787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
+   "referenced_type" : "type-496",
+   "self_type" : "type-544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15920,8 +24796,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-836",
+   "self_type" : "type-837",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15929,8 +24805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-605",
+   "referenced_type" : "type-838",
+   "self_type" : "type-1100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15938,8 +24814,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
    "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-604",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1099",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15947,8 +24823,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
    "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-515",
+   "self_type" : "type-533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15956,8 +24832,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-278",
+   "referenced_type" : "type-844",
+   "self_type" : "type-846",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15965,8 +24841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-285",
+   "referenced_type" : "type-802",
+   "self_type" : "type-853",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
@@ -15974,8 +24850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-847",
+   "self_type" : "type-1930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15983,8 +24859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-139",
+   "referenced_type" : "type-727",
+   "self_type" : "type-732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15992,8 +24868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
    "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1929",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16001,8 +24877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
    "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2004",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16010,8 +24886,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
    "name" : "android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-499",
+   "self_type" : "type-550",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16019,8 +24895,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "type-518",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3624",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2200",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::Thread> *",
+   "name" : "android::sp<android::Thread> *",
+   "referenced_type" : "type-453",
+   "self_type" : "type-3636",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16028,17 +24931,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-906",
+   "referenced_type" : "type-426",
+   "self_type" : "type-457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2314",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> *",
    "name" : "android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-366",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16046,8 +24958,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-380",
+   "referenced_type" : "type-921",
+   "self_type" : "type-923",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16055,8 +24967,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-886",
+   "referenced_type" : "type-384",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16064,8 +24976,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-157",
+   "referenced_type" : "type-719",
+   "self_type" : "type-742",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16073,8 +24985,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-894",
-   "self_type" : "type-898",
+   "referenced_type" : "type-445",
+   "self_type" : "type-449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16082,8 +24994,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-976",
-   "self_type" : "type-978",
+   "referenced_type" : "type-556",
+   "self_type" : "type-558",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16091,8 +25003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-743",
+   "self_type" : "type-745",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16100,8 +25012,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-397",
+   "referenced_type" : "type-907",
+   "self_type" : "type-940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16109,8 +25021,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-304",
-   "self_type" : "type-879",
+   "referenced_type" : "type-81",
+   "self_type" : "type-429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16118,8 +25030,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-884",
+   "referenced_type" : "type-300",
+   "self_type" : "type-434",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16127,8 +25039,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-962",
+   "referenced_type" : "type-527",
+   "self_type" : "type-529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16136,8 +25048,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-969",
+   "referenced_type" : "type-543",
+   "self_type" : "type-545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16145,8 +25057,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-964",
+   "referenced_type" : "type-532",
+   "self_type" : "type-534",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16154,8 +25066,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-972",
+   "referenced_type" : "type-549",
+   "self_type" : "type-551",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16163,8 +25075,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-127",
-   "self_type" : "type-967",
+   "referenced_type" : "type-538",
+   "self_type" : "type-540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16172,8 +25084,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-797",
-   "self_type" : "type-872",
+   "referenced_type" : "type-331",
+   "self_type" : "type-422",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16181,8 +25093,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-354",
+   "referenced_type" : "type-900",
+   "self_type" : "type-905",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
+   "name" : "android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16190,8 +25111,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-867",
+   "referenced_type" : "type-307",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16199,8 +25120,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-858",
+   "referenced_type" : "type-309",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16208,17 +25129,35 @@
    "alignment" : 8,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-716",
-   "self_type" : "type-720",
+   "referenced_type" : "type-230",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2243",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-3594",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-450",
+   "referenced_type" : "type-43",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16226,17 +25165,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CallStack *",
    "name" : "const android::CallStack *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-689",
+   "referenced_type" : "type-200",
+   "self_type" : "type-201",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3651",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2231",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-756",
-   "self_type" : "type-757",
+   "referenced_type" : "type-278",
+   "self_type" : "type-279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -16244,17 +25201,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-63",
+   "referenced_type" : "type-23",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3641",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2221",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-771",
+   "referenced_type" : "type-293",
+   "self_type" : "type-294",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16262,17 +25237,80 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-657",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::RefBase *> *",
+   "name" : "const android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3442",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3438",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-685",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3434",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2226",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3645",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2333",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2326",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16280,17 +25318,71 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
+   "referenced_type" : "type-191",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BHwBinder *",
+   "name" : "const android::hardware::BHwBinder *",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2174",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwBinder *",
+   "name" : "const android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2185",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
+   "name" : "const android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2204",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2238",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2183",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
+   "name" : "const android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2321",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-486",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1012",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16298,8 +25390,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-488",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1014",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16307,8 +25399,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-809",
-   "self_type" : "type-810",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16316,8 +25408,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-596",
+   "self_type" : "type-598",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16325,17 +25417,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-816",
-   "self_type" : "type-818",
+   "referenced_type" : "type-355",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::HexDump *",
+   "name" : "const android::hardware::HexDump *",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2301",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16343,8 +25444,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2142",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16352,17 +25462,80 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-891",
-   "self_type" : "type-893",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3781",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-442",
+   "self_type" : "type-444",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
+   "name" : "const android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2233",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IInterface *",
+   "name" : "const android::hardware::IInterface *",
+   "referenced_type" : "type-3410",
+   "self_type" : "type-3411",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IPCThreadState *",
+   "name" : "const android::hardware::IPCThreadState *",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3452",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel *",
+   "name" : "const android::hardware::Parcel *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-3579",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::ProcessState *",
+   "name" : "const android::hardware::ProcessState *",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3664",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
+   "name" : "const android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-3625",
+   "self_type" : "type-3626",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-187",
+   "referenced_type" : "type-768",
+   "self_type" : "type-769",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16370,8 +25543,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16379,8 +25552,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-407",
+   "referenced_type" : "type-948",
+   "self_type" : "type-949",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16388,8 +25561,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-547",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1058",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16397,8 +25570,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-620",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16406,8 +25579,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16415,8 +25588,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2020",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16424,8 +25597,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-909",
+   "referenced_type" : "type-460",
+   "self_type" : "type-461",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16433,17 +25606,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-412",
-   "self_type" : "type-422",
+   "referenced_type" : "type-107",
+   "self_type" : "type-111",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::TypeCode *",
+   "name" : "const android::hardware::TypeCode *",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2296",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16451,8 +25633,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-171",
+   "referenced_type" : "type-2726",
+   "self_type" : "type-2728",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-754",
+   "self_type" : "type-756",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16460,8 +25651,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1037",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16469,8 +25660,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-607",
+   "self_type" : "type-608",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16478,8 +25669,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-237",
-   "self_type" : "type-240",
+   "referenced_type" : "type-809",
+   "self_type" : "type-812",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16487,8 +25678,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char> *",
    "name" : "const android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-334",
+   "referenced_type" : "type-88",
+   "self_type" : "type-89",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16496,8 +25687,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-138",
+   "referenced_type" : "type-8",
+   "self_type" : "type-46",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16505,8 +25696,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-936",
+   "referenced_type" : "type-492",
+   "self_type" : "type-493",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16514,8 +25705,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-455",
-   "self_type" : "type-469",
+   "referenced_type" : "type-115",
+   "self_type" : "type-118",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16523,8 +25714,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16532,8 +25723,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-883",
+   "referenced_type" : "type-432",
+   "self_type" : "type-433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16541,8 +25732,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle *",
    "name" : "const android::hardware::hidl_handle *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-93",
+   "referenced_type" : "type-31",
+   "self_type" : "type-37",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16550,8 +25741,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-222",
-   "self_type" : "type-234",
+   "referenced_type" : "type-62",
+   "self_type" : "type-66",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16559,8 +25750,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-189",
+   "referenced_type" : "type-47",
+   "self_type" : "type-56",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16568,8 +25759,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2084",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16577,8 +25768,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-990",
+   "referenced_type" : "type-574",
+   "self_type" : "type-575",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16586,8 +25777,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-981",
+   "self_type" : "type-982",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16595,8 +25786,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-996",
-   "self_type" : "type-997",
+   "referenced_type" : "type-581",
+   "self_type" : "type-582",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16604,8 +25795,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-921",
-   "self_type" : "type-922",
+   "referenced_type" : "type-477",
+   "self_type" : "type-478",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16613,8 +25804,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-277",
-   "self_type" : "type-287",
+   "referenced_type" : "type-73",
+   "self_type" : "type-74",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16622,8 +25813,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-828",
-   "self_type" : "type-829",
+   "referenced_type" : "type-373",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -16631,8 +25822,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16640,8 +25831,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-833",
+   "self_type" : "type-835",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -16649,8 +25840,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-256",
+   "referenced_type" : "type-825",
+   "self_type" : "type-826",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -16658,8 +25849,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -16667,8 +25858,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-980",
+   "self_type" : "type-979",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16676,8 +25867,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-938",
-   "self_type" : "type-939",
+   "referenced_type" : "type-495",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16685,8 +25876,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-842",
+   "self_type" : "type-843",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -16694,8 +25885,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-952",
-   "self_type" : "type-953",
+   "referenced_type" : "type-514",
+   "self_type" : "type-516",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -16703,8 +25894,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-284",
+   "referenced_type" : "type-851",
+   "self_type" : "type-852",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -16712,8 +25903,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-854",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -16721,8 +25912,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-940",
-   "self_type" : "type-941",
+   "referenced_type" : "type-498",
+   "self_type" : "type-500",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -16730,17 +25921,71 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-955",
+   "referenced_type" : "type-517",
+   "self_type" : "type-519",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3627",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2202",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::Thread> *",
+   "name" : "const android::sp<android::Thread> *",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3650",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
+   "name" : "const android::sp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3459",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2315",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory> *",
    "name" : "const android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-390",
+   "referenced_type" : "type-100",
+   "self_type" : "type-101",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16748,8 +25993,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-890",
+   "referenced_type" : "type-440",
+   "self_type" : "type-441",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
+   "name" : "const android::sp<android::hardware::IInterface> *",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16757,8 +26011,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-899",
-   "self_type" : "type-900",
+   "referenced_type" : "type-450",
+   "self_type" : "type-451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16766,8 +26020,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-559",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16775,8 +26029,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-162",
-   "self_type" : "type-168",
+   "referenced_type" : "type-747",
+   "self_type" : "type-753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16784,8 +26038,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-400",
+   "referenced_type" : "type-906",
+   "self_type" : "type-943",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16793,8 +26047,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-303",
-   "self_type" : "type-393",
+   "referenced_type" : "type-80",
+   "self_type" : "type-102",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16802,8 +26056,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-862",
-   "self_type" : "type-885",
+   "referenced_type" : "type-411",
+   "self_type" : "type-435",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16811,8 +26065,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-299",
-   "self_type" : "type-963",
+   "referenced_type" : "type-530",
+   "self_type" : "type-531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16820,8 +26074,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-970",
+   "referenced_type" : "type-546",
+   "self_type" : "type-547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16829,8 +26083,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-965",
+   "referenced_type" : "type-535",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16838,8 +26092,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-975",
+   "referenced_type" : "type-554",
+   "self_type" : "type-555",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16847,8 +26101,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-968",
+   "referenced_type" : "type-541",
+   "self_type" : "type-542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16856,8 +26110,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-423",
+   "self_type" : "type-428",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2223",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
+   "name" : "const android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3573",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16865,8 +26137,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-868",
-   "self_type" : "type-870",
+   "referenced_type" : "type-418",
+   "self_type" : "type-420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16874,17 +26146,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-866",
+   "referenced_type" : "type-415",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const binder_buffer_object *",
+   "name" : "const binder_buffer_object *",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3602",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16892,8 +26173,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16901,8 +26182,8 @@
    "alignment" : 8,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-116",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16910,8 +26191,8 @@
    "alignment" : 8,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1831",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16919,17 +26200,35 @@
    "alignment" : 8,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2972",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1052",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const flat_binder_object *",
+   "name" : "const flat_binder_object *",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3597",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-569",
+   "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16937,8 +26236,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-671",
-   "self_type" : "type-672",
+   "referenced_type" : "type-182",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16946,35 +26245,89 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const native_handle **",
+   "name" : "const native_handle **",
+   "referenced_type" : "type-11",
+   "self_type" : "type-3599",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-523",
+   "self_type" : "type-989",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const unsigned long *",
+   "name" : "const unsigned long *",
+   "referenced_type" : "type-190",
+   "self_type" : "type-3544",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const unsigned long long *",
+   "name" : "const unsigned long long *",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2164",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-301",
+   "referenced_type" : "type-76",
+   "self_type" : "type-78",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const void **",
+   "name" : "const void **",
+   "referenced_type" : "type-78",
+   "self_type" : "type-3598",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "double *",
+   "name" : "double *",
+   "referenced_type" : "type-6",
+   "self_type" : "type-3593",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "float *",
+   "name" : "float *",
+   "referenced_type" : "type-238",
+   "self_type" : "type-3592",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-729",
-   "self_type" : "type-730",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16982,8 +26335,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-196",
+   "referenced_type" : "type-14",
+   "self_type" : "type-476",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16991,26 +26344,71 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-668",
-   "self_type" : "type-674",
+   "referenced_type" : "type-179",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "long *",
+   "name" : "long *",
+   "referenced_type" : "type-265",
+   "self_type" : "type-3591",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-90",
+   "referenced_type" : "type-13",
+   "self_type" : "type-36",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "short *",
+   "name" : "short *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-3588",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-484",
+   "self_type" : "type-3587",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2305",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3595",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1710",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17018,8 +26416,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2113",
-   "self_type" : "type-2112",
+   "referenced_type" : "type-2852",
+   "self_type" : "type-2851",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17027,8 +26425,17 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17036,26 +26443,80 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-717",
+   "referenced_type" : "type-146",
+   "self_type" : "type-231",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "unsigned int *",
+   "name" : "unsigned int *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-3590",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-474",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1001",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "unsigned long long *",
+   "name" : "unsigned long long *",
+   "referenced_type" : "type-389",
+   "self_type" : "type-2161",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned short *",
+   "name" : "unsigned short *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-3589",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void (*)(const void *, void *, void *)",
+   "name" : "void (*)(const void *, void *, void *)",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void (*)(void *, const char *)",
+   "name" : "void (*)(void *, const char *)",
+   "referenced_type" : "type-3398",
+   "self_type" : "type-3399",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-676",
+   "referenced_type" : "type-77",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17063,8 +26524,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-676",
-   "self_type" : "type-732",
+   "referenced_type" : "type-188",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -17074,10 +26535,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase *const",
+   "name" : "android::RefBase *const",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3420",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1145",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1061",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17086,8 +26557,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1118",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17096,8 +26567,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17106,8 +26577,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1299",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17116,8 +26587,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1275",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17126,8 +26597,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17136,8 +26607,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17146,8 +26617,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17156,8 +26627,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17166,8 +26637,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17176,8 +26647,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1749",
+   "self_type" : "type-1751",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17186,8 +26657,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1670",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17196,8 +26667,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1894",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17206,8 +26677,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1954",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17216,8 +26687,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2026",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17226,8 +26697,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1846",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2072",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17236,8 +26707,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17246,8 +26717,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-197",
-   "self_type" : "type-199",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2122",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17256,8 +26727,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17266,8 +26737,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17276,8 +26747,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17286,8 +26757,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-307",
-   "self_type" : "type-309",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17296,8 +26767,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17306,8 +26777,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-552",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17316,8 +26787,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2641",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17326,8 +26797,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-747",
-   "self_type" : "type-749",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17336,8 +26807,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7",
-   "self_type" : "type-9",
+   "referenced_type" : "type-266",
+   "self_type" : "type-268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17346,8 +26817,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-81",
-   "self_type" : "type-83",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17356,8 +26827,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-912",
-   "self_type" : "type-914",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2748",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17366,28 +26837,628 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-983",
-   "self_type" : "type-985",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2818",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2892",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2980",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3033",
+   "self_type" : "type-3035",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3091",
+   "self_type" : "type-3093",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3163",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3207",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3256",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3272",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3322",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3372",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3391",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3394",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3403",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3428",
+   "self_type" : "type-3430",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3569",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3635",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3700",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3791",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3860",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-464",
+   "self_type" : "type-466",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-563",
+   "self_type" : "type-565",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-650",
+   "self_type" : "type-652",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-698",
+   "self_type" : "type-700",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-776",
+   "self_type" : "type-778",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-870",
+   "self_type" : "type-872",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-955",
+   "self_type" : "type-957",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_type *const",
+   "name" : "android::RefBase::weakref_type *const",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3418",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::BHwBinder *const",
+   "name" : "android::hardware::BHwBinder *const",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-3416",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2178",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "char *const",
+   "name" : "char *const",
+   "referenced_type" : "type-186",
+   "self_type" : "type-3606",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[10]",
+   "name" : "char const[10]",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[11]",
+   "name" : "char const[11]",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[12]",
+   "name" : "char const[12]",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[13]",
+   "name" : "char const[13]",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[14]",
+   "name" : "char const[14]",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[15]",
+   "name" : "char const[15]",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[16]",
+   "name" : "char const[16]",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[17]",
+   "name" : "char const[17]",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[18]",
+   "name" : "char const[18]",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[19]",
+   "name" : "char const[19]",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[20]",
+   "name" : "char const[20]",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[22]",
+   "name" : "char const[22]",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[25]",
+   "name" : "char const[25]",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[28]",
+   "name" : "char const[28]",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[29]",
+   "name" : "char const[29]",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[2]",
+   "name" : "char const[2]",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3472",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[31]",
+   "name" : "char const[31]",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[32]",
+   "name" : "char const[32]",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[35]",
+   "name" : "char const[35]",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3528",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[37]",
+   "name" : "char const[37]",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[3]",
+   "name" : "char const[3]",
+   "referenced_type" : "type-3486",
+   "self_type" : "type-3485",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[4]",
+   "name" : "char const[4]",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3608",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[5]",
+   "name" : "char const[5]",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[6]",
+   "name" : "char const[6]",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[7]",
+   "name" : "char const[7]",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[8]",
+   "name" : "char const[8]",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[9]",
+   "name" : "char const[9]",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::CallStack",
    "name" : "const android::CallStack",
-   "referenced_type" : "type-686",
-   "self_type" : "type-688",
+   "referenced_type" : "type-198",
+   "self_type" : "type-200",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-383",
+   "self_type" : "type-3649",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2230",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-743",
-   "self_type" : "type-756",
+   "referenced_type" : "type-258",
+   "self_type" : "type-278",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -17396,18 +27467,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-55",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-376",
+   "self_type" : "type-3640",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2220",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-764",
-   "self_type" : "type-770",
+   "referenced_type" : "type-287",
+   "self_type" : "type-293",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17416,18 +27507,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
+   "referenced_type" : "type-165",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase *>",
+   "name" : "const android::Vector<android::RefBase *>",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3441",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
+   "name" : "const android::Vector<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3437",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-684",
+   "referenced_type" : "type-194",
+   "self_type" : "type-196",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
+   "name" : "const android::Vector<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3433",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2225",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-378",
+   "self_type" : "type-3644",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2332",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<int>",
+   "name" : "const android::Vector<int>",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2325",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17436,18 +27597,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-675",
-   "self_type" : "type-679",
+   "referenced_type" : "type-187",
+   "self_type" : "type-191",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BHwBinder",
+   "name" : "const android::hardware::BHwBinder",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2173",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder",
+   "name" : "const android::hardware::BpHwBinder",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2184",
+   "size" : 144,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
+   "name" : "const android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2203",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2237",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2210",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2182",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput",
+   "name" : "const android::hardware::BufferedTextOutput",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2320",
+   "size" : 72,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
-   "referenced_type" : "type-30",
-   "self_type" : "type-485",
+   "referenced_type" : "type-663",
+   "self_type" : "type-1011",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17456,8 +27687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
-   "referenced_type" : "type-42",
-   "self_type" : "type-487",
+   "referenced_type" : "type-669",
+   "self_type" : "type-1013",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17466,8 +27697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
-   "referenced_type" : "type-792",
-   "self_type" : "type-809",
+   "referenced_type" : "type-326",
+   "self_type" : "type-343",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17476,8 +27707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-588",
+   "self_type" : "type-596",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17486,18 +27717,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
-   "referenced_type" : "type-321",
-   "self_type" : "type-816",
+   "referenced_type" : "type-347",
+   "self_type" : "type-355",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::HexDump",
+   "name" : "const android::hardware::HexDump",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2300",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1286",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17506,8 +27747,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2141",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2436",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17516,38 +27767,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-3780",
+   "self_type" : "type-3779",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1197",
-   "size" : 136,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
+   "name" : "const android::hardware::IBinder::DeathRecipient",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2232",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IInterface",
+   "name" : "const android::hardware::IInterface",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-3410",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IPCThreadState",
+   "name" : "const android::hardware::IPCThreadState",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-3451",
+   "size" : 528,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1537",
-   "size" : 136,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1084",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17556,8 +27827,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17566,8 +27837,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1780",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1862",
+   "size" : 136,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
+   "size" : 136,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1984",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -17576,8 +27887,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2037",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17586,8 +27897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -17596,8 +27907,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2166",
+   "size" : 136,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17606,8 +27927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2921",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17616,8 +27937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-3004",
+   "self_type" : "type-3003",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17626,8 +27947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17636,18 +27957,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
+   "size" : 136,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3175",
+   "self_type" : "type-3174",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
+   "size" : 136,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-999",
+   "self_type" : "type-998",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState",
+   "name" : "const android::hardware::ProcessState",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-3663",
+   "size" : 328,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
+   "name" : "const android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3625",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-186",
+   "referenced_type" : "type-764",
+   "self_type" : "type-768",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17656,8 +28047,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-172",
-   "self_type" : "type-178",
+   "referenced_type" : "type-757",
+   "self_type" : "type-762",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17666,8 +28057,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-406",
+   "referenced_type" : "type-944",
+   "self_type" : "type-948",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17676,8 +28067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
-   "referenced_type" : "type-542",
-   "self_type" : "type-546",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1057",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17686,8 +28077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
-   "referenced_type" : "type-615",
-   "self_type" : "type-619",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1114",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17696,8 +28087,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1949",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17706,8 +28097,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2019",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17716,8 +28107,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-410",
+   "referenced_type" : "type-250",
+   "self_type" : "type-460",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17726,8 +28117,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "type-120",
+   "self_type" : "type-714",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17736,18 +28127,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-106",
-   "self_type" : "type-412",
+   "referenced_type" : "type-103",
+   "self_type" : "type-107",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::TypeCode",
+   "name" : "const android::hardware::TypeCode",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2295",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-484",
+   "referenced_type" : "type-368",
+   "self_type" : "type-1010",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17756,8 +28157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 176,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17766,8 +28167,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
+   "size" : 176,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::Waiter",
+   "name" : "const android::hardware::details::Waiter",
+   "referenced_type" : "type-755",
+   "self_type" : "type-754",
    "size" : 176,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17776,8 +28187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-513",
+   "referenced_type" : "type-968",
+   "self_type" : "type-1036",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17786,8 +28197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-572",
+   "self_type" : "type-607",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17796,8 +28207,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-237",
+   "referenced_type" : "type-792",
+   "self_type" : "type-809",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17806,8 +28217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char>",
    "name" : "const android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-319",
+   "referenced_type" : "type-39",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17816,8 +28227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17826,8 +28237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int>",
    "name" : "const android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-210",
+   "referenced_type" : "type-474",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17836,8 +28247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-105",
-   "self_type" : "type-455",
+   "referenced_type" : "type-112",
+   "self_type" : "type-115",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17846,8 +28257,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32>",
    "name" : "const android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-971",
+   "self_type" : "type-2082",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17856,8 +28267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-882",
+   "referenced_type" : "type-83",
+   "self_type" : "type-432",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17866,8 +28277,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-79",
+   "referenced_type" : "type-28",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17876,8 +28287,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-203",
-   "self_type" : "type-222",
+   "referenced_type" : "type-60",
+   "self_type" : "type-62",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17886,8 +28297,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-143",
+   "referenced_type" : "type-38",
+   "self_type" : "type-47",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17896,8 +28307,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-967",
+   "self_type" : "type-2083",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17906,8 +28317,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-476",
+   "referenced_type" : "type-571",
+   "self_type" : "type-574",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17916,8 +28327,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-445",
+   "referenced_type" : "type-791",
+   "self_type" : "type-981",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17926,8 +28337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
-   "referenced_type" : "type-991",
-   "self_type" : "type-996",
+   "referenced_type" : "type-576",
+   "self_type" : "type-581",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17936,8 +28347,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-921",
+   "referenced_type" : "type-473",
+   "self_type" : "type-477",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17946,8 +28357,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-277",
+   "referenced_type" : "type-70",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17956,8 +28367,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase",
    "name" : "const android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-828",
+   "referenced_type" : "type-369",
+   "self_type" : "type-373",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -17966,8 +28377,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-759",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17976,8 +28387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "referenced_type" : "type-302",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17986,8 +28397,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const",
    "name" : "const android::hidl::base::V1_0::IBase *const",
-   "referenced_type" : "type-795",
-   "self_type" : "type-811",
+   "referenced_type" : "type-329",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17996,8 +28407,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-265",
+   "referenced_type" : "type-829",
+   "self_type" : "type-833",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -18006,8 +28417,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-255",
+   "referenced_type" : "type-821",
+   "self_type" : "type-825",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -18016,8 +28427,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager",
    "name" : "const android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-943",
+   "referenced_type" : "type-505",
+   "self_type" : "type-504",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18026,8 +28437,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-444",
+   "referenced_type" : "type-503",
+   "self_type" : "type-980",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18036,8 +28447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-942",
-   "self_type" : "type-947",
+   "referenced_type" : "type-502",
+   "self_type" : "type-509",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18046,8 +28457,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-945",
+   "referenced_type" : "type-501",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18056,8 +28467,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-938",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -18066,8 +28477,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-274",
+   "referenced_type" : "type-838",
+   "self_type" : "type-842",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -18076,8 +28487,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager",
    "name" : "const android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-952",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -18086,8 +28497,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-283",
+   "referenced_type" : "type-847",
+   "self_type" : "type-851",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -18096,8 +28507,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-130",
-   "self_type" : "type-286",
+   "referenced_type" : "type-727",
+   "self_type" : "type-854",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -18106,8 +28517,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback",
    "name" : "const android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-940",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -18116,28 +28527,138 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-954",
+   "referenced_type" : "type-518",
+   "self_type" : "type-517",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
-   "name" : "const android::sp<android::hardware::HidlMemory>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-383",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3620",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::Thread>",
+   "name" : "const android::sp<android::Thread>",
+   "referenced_type" : "type-453",
+   "self_type" : "type-3643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
+   "name" : "const android::sp<android::hardware::BHwBinder>",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3450",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2308",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
+   "name" : "const android::sp<android::hardware::HidlMemory>",
+   "referenced_type" : "type-93",
+   "self_type" : "type-100",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2168",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-921",
+   "self_type" : "type-2217",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2334",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3389",
+   "self_type" : "type-3388",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3396",
+   "self_type" : "type-3395",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-440",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
+   "name" : "const android::sp<android::hardware::IInterface>",
+   "referenced_type" : "type-927",
+   "self_type" : "type-3407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18146,8 +28667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18156,8 +28677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-899",
+   "referenced_type" : "type-445",
+   "self_type" : "type-450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18166,8 +28687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-979",
+   "referenced_type" : "type-556",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18176,8 +28697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter>",
    "name" : "const android::sp<android::hardware::details::Waiter>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-162",
+   "referenced_type" : "type-743",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18186,8 +28707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
+   "referenced_type" : "type-907",
+   "self_type" : "type-906",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18196,8 +28717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-81",
+   "self_type" : "type-80",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18206,8 +28727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-173",
-   "self_type" : "type-862",
+   "referenced_type" : "type-300",
+   "self_type" : "type-411",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18216,8 +28737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
-   "referenced_type" : "type-258",
-   "self_type" : "type-299",
+   "referenced_type" : "type-527",
+   "self_type" : "type-530",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18226,8 +28747,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "type-543",
+   "self_type" : "type-546",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18236,8 +28757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-116",
+   "referenced_type" : "type-532",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18246,8 +28767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "type-549",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18256,8 +28777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
+   "referenced_type" : "type-538",
+   "self_type" : "type-541",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18266,8 +28787,36 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-873",
+   "referenced_type" : "type-331",
+   "self_type" : "type-423",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2171",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1212",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-3565",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18275,24 +28824,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -18300,8 +28849,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient>",
    "name" : "const android::wp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-868",
+   "referenced_type" : "type-307",
+   "self_type" : "type-418",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18310,18 +28859,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-65",
+   "referenced_type" : "type-309",
+   "self_type" : "type-415",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const binder_buffer_object",
+   "name" : "const binder_buffer_object",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-905",
+   "referenced_type" : "type-29",
+   "self_type" : "type-456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18330,18 +28889,28 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-101",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const char *const",
+   "name" : "const char *const",
+   "referenced_type" : "type-41",
+   "self_type" : "type-2289",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-290",
+   "self_type" : "type-289",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18350,8 +28919,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18360,8 +28929,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1777",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18370,8 +28939,18 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2919",
+   "self_type" : "type-2918",
+   "size" : 280,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18386,12 +28965,22 @@
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const flat_binder_object",
+   "name" : "const flat_binder_object",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-724",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-238",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18400,8 +28989,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-441",
+   "referenced_type" : "type-14",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18409,240 +28998,360 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1062",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1370",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1541",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1895",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1955",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1836",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2027",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-201",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2449",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-273",
+   "self_type" : "type-272",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "type-2751",
+   "self_type" : "type-2750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2777",
+   "self_type" : "type-2776",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-752",
-   "self_type" : "type-751",
+   "referenced_type" : "type-2895",
+   "self_type" : "type-2894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "type-2982",
+   "self_type" : "type-2981",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-919",
-   "self_type" : "type-918",
+   "referenced_type" : "type-3037",
+   "self_type" : "type-3036",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-988",
-   "self_type" : "type-987",
+   "referenced_type" : "type-3095",
+   "self_type" : "type-3094",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3257",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3862",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-655",
+   "self_type" : "type-654",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-703",
+   "self_type" : "type-702",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-875",
+   "self_type" : "type-874",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18650,8 +29359,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-671",
+   "referenced_type" : "type-179",
+   "self_type" : "type-182",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18660,8 +29369,8 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-746",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-265",
+   "self_type" : "type-605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18670,8 +29379,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-13",
+   "self_type" : "type-12",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18680,8 +29389,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-971",
+   "referenced_type" : "type-151",
+   "self_type" : "type-548",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18690,8 +29399,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-928",
-   "self_type" : "type-927",
+   "referenced_type" : "type-484",
+   "self_type" : "type-483",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18700,8 +29409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18710,8 +29419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18720,8 +29429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1202",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18730,8 +29439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18740,8 +29449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18750,8 +29459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18760,8 +29469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1547",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18770,8 +29479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18780,8 +29489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18790,8 +29499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18800,8 +29509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1847",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18810,8 +29519,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18820,8 +29529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1962",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18830,8 +29539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2034",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18840,8 +29549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18850,8 +29559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2126",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18860,8 +29569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18870,8 +29579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2078",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18880,8 +29589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-224",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18890,8 +29599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18900,8 +29609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2688",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18910,8 +29619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18920,8 +29629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18930,8 +29639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18940,8 +29649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18950,8 +29659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-926",
-   "self_type" : "type-925",
+   "referenced_type" : "type-2989",
+   "self_type" : "type-2988",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18960,8 +29669,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
+   "referenced_type" : "type-3045",
+   "self_type" : "type-3044",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3101",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3221",
+   "self_type" : "type-3220",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3261",
+   "self_type" : "type-3260",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3801",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3874",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-482",
+   "self_type" : "type-481",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-709",
+   "self_type" : "type-708",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18970,8 +29819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18980,8 +29829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1082",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18990,8 +29839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19000,8 +29849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19010,8 +29859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1522",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19020,8 +29869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19030,8 +29879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19040,8 +29889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1750",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19050,8 +29899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1860",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19060,8 +29909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1916",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19070,8 +29919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19080,8 +29929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19090,8 +29939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19100,8 +29949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19110,8 +29959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19120,8 +29969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-2783",
+   "self_type" : "type-2782",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19130,8 +29979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-645",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19140,8 +29989,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-950",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3001",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-684",
+   "self_type" : "type-683",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-817",
+   "self_type" : "type-816",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-889",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19150,8 +30099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19160,8 +30109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1080",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19170,8 +30119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19180,8 +30129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19190,8 +30139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1520",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19200,8 +30149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19220,8 +30169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1806",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19230,8 +30179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1858",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19240,8 +30189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1914",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19250,8 +30199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2024",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19260,8 +30209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-243",
-   "self_type" : "type-242",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2052",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19270,8 +30219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-333",
-   "self_type" : "type-332",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19280,8 +30229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2477",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19290,8 +30239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19300,8 +30249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19310,8 +30259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19320,8 +30269,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-948",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3000",
+   "self_type" : "type-2999",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3056",
+   "self_type" : "type-3055",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3118",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-682",
+   "self_type" : "type-681",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-815",
+   "self_type" : "type-814",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19330,8 +30379,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19340,48 +30419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1142",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19390,8 +30429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19400,38 +30439,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1496",
+   "self_type" : "type-1495",
    "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1545",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1616",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19440,8 +30459,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1682",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19450,8 +30479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1849",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19460,8 +30489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19470,8 +30499,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2088",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -19480,8 +30529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1938",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19490,8 +30539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2462",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19500,8 +30549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2540",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19510,8 +30559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2636",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19520,8 +30569,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2723",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -19530,6 +30589,106 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2991",
+   "self_type" : "type-2990",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3046",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3106",
+   "self_type" : "type-3105",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3222",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3805",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 24,
@@ -19540,58 +30699,68 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-752",
+   "self_type" : "type-751",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
    "alignment" : 16,
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19600,8 +30769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19610,8 +30779,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-3879",
+   "self_type" : "type-3878",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19620,8 +30799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19630,8 +30809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19640,8 +30819,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-814",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
+   "name" : "const std::function<sp<IBinder> (void *)>",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19650,8 +30839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -19660,8 +30849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -19670,128 +30859,248 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3453",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1764",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2032",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2905",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2986",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3100",
+   "self_type" : "type-3099",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3169",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1065",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
    "referenced_type" : "type-1759",
    "self_type" : "type-1758",
-   "size" : 48,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
-   "size" : 48,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-734",
-   "self_type" : "type-733",
-   "size" : 48,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
-   "size" : 48,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1527",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1676",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-1732",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1840",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-630",
-   "self_type" : "type-629",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19800,8 +31109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19810,8 +31119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19820,8 +31129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19830,8 +31139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19840,8 +31149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19850,8 +31159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2899",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19860,8 +31169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2984",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19870,8 +31179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-3040",
+   "self_type" : "type-3039",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19880,18 +31189,58 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
+   "referenced_type" : "type-3098",
+   "self_type" : "type-3097",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3212",
+   "self_type" : "type-3211",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19900,8 +31249,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> >",
+   "name" : "const std::vector<int, std::allocator<int> >",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19910,8 +31269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19920,8 +31279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19930,8 +31289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19940,8 +31299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19950,8 +31309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19960,8 +31319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19970,8 +31329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19980,8 +31339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19990,8 +31349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1551",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20000,8 +31359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20010,8 +31369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-164",
+   "self_type" : "type-163",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20020,8 +31379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1663",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20030,8 +31389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20040,8 +31399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20050,8 +31409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1820",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20060,8 +31419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20070,48 +31429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1761",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1885",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20130,8 +31449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2033",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20140,8 +31459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20150,8 +31469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20160,8 +31479,178 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-291",
-   "self_type" : "type-290",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2486",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2666",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2692",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2804",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3009",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3026",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3131",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3246",
+   "self_type" : "type-3245",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20180,8 +31669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "type-3721",
+   "self_type" : "type-3720",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20190,8 +31679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3829",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20200,8 +31689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20210,8 +31699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20220,8 +31709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20230,8 +31719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-611",
+   "self_type" : "type-610",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20240,8 +31729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20250,8 +31739,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-958",
-   "self_type" : "type-957",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20260,8 +31749,48 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-892",
+   "self_type" : "type-891",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20270,18 +31799,28 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-454",
+   "referenced_type" : "type-146",
+   "self_type" : "type-523",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned char *const",
+   "name" : "const unsigned char *const",
+   "referenced_type" : "type-989",
+   "self_type" : "type-3541",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-677",
+   "referenced_type" : "type-44",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20290,18 +31829,38 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-678",
+   "referenced_type" : "type-16",
+   "self_type" : "type-190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned long *const",
+   "name" : "const unsigned long *const",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned long long",
+   "name" : "const unsigned long long",
+   "referenced_type" : "type-389",
+   "self_type" : "type-2165",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-982",
+   "referenced_type" : "type-71",
+   "self_type" : "type-562",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20309,38 +31868,121 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-295",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const void *const",
+   "name" : "const void *const",
+   "referenced_type" : "type-78",
+   "self_type" : "type-2198",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "void *const",
+   "name" : "void *const",
+   "referenced_type" : "type-188",
+   "self_type" : "type-3482",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 1,
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-861",
+   "referenced_type" : "type-29",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-14",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
   }
  ],
  "record_types" :
  [
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 64,
+     "referenced_type" : "type-2314"
+    },
+    {
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 128,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mENK7RenamerclEm"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mEN7RenamerD0Ev"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mFrameLines",
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::CallStack",
    "name" : "android::CallStack",
    "record_kind" : "class",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStackE"
@@ -20349,27 +31991,37 @@
    "alignment" : 1,
    "linker_set_key" : "android::CallStack::StackDeleter",
    "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-690",
-   "self_type" : "type-690",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::CompileTimeAssert<true>",
+   "name" : "android::CompileTimeAssert<true>",
+   "referenced_type" : "type-3619",
+   "self_type" : "type-3619",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Debug.h",
+   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -20381,37 +32033,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-838",
-   "self_type" : "type-838",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-764", "type-72" ],
+   "template_args" : [ "type-287", "type-384" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2153"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2152",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-78", "type-2155" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-257"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-743" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -20421,17 +32093,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -20441,14 +32113,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-842"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -20460,14 +32132,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -20477,7 +32149,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-256"
     }
    ],
    "fields" :
@@ -20486,20 +32158,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -20511,14 +32183,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-401"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -20530,14 +32202,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-856"
+     "referenced_type" : "type-405"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -20549,14 +32221,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-856"
+     "referenced_type" : "type-405"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -20569,14 +32241,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -20616,8 +32288,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -20627,8 +32299,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -20638,8 +32310,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-7",
+   "self_type" : "type-7",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -20665,14 +32337,14 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1024",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -20683,17 +32355,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-832" ],
+   "template_args" : [ "type-377" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -20740,14 +32412,72 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-675"
+     "access" : "private",
+     "referenced_type" : "type-193"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2154" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_m"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_m"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_m"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_m"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -20805,14 +32535,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-288"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-764",
-   "self_type" : "type-764",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -20824,14 +32554,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -20842,7 +32572,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -20851,62 +32581,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-905"
+     "referenced_type" : "type-456"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-390"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-453"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-904",
-   "self_type" : "type-904",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -20996,17 +32726,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -21051,17 +32781,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-36" ],
+   "template_args" : [ "type-308" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -21106,17 +32836,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -21161,17 +32891,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-798" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -21216,17 +32946,72 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-834" ],
+   "template_args" : [ "type-379" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -21267,38 +33052,148 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<int>",
+   "name" : "android::Vector<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6VectorIiEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-189"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-678"
+     "referenced_type" : "type-190"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -21350,14 +33245,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-124"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -21381,29 +33276,640 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3691",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287", "type-384" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2155" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2139"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 96,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 128,
+     "referenced_type" : "type-2145"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 192,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2139"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mHandle",
+     "field_offset" : 64,
+     "referenced_type" : "type-569"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlive",
+     "field_offset" : 416,
+     "referenced_type" : "type-2148"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObitsSent",
+     "field_offset" : 448,
+     "referenced_type" : "type-2148"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObituaries",
+     "field_offset" : 512,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 576,
+     "referenced_type" : "type-2151"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mConstantData",
+     "field_offset" : 896,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDescriptorCache",
+     "field_offset" : 960,
+     "referenced_type" : "type-287"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder",
+   "name" : "android::hardware::BpHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
+   "size" : 144,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 128,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "recipient",
+     "referenced_type" : "type-900"
+    },
+    {
+     "field_name" : "cookie",
+     "field_offset" : 128,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
+   "name" : "android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "referenced_type" : "type-2152"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
+   "name" : "android::hardware::BpHwBinder::ObjectManager",
+   "record_kind" : "class",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "object",
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "cleanupCookie",
+     "field_offset" : 64,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "func",
+     "field_offset" : 128,
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 64,
+     "referenced_type" : "type-2178"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 128,
+     "referenced_type" : "type-308"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 192,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2285"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mFlags",
+     "field_offset" : 64,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSeq",
+     "field_offset" : 96,
+     "referenced_type" : "type-569"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIndex",
+     "field_offset" : 128,
+     "referenced_type" : "type-569"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 160,
+     "referenced_type" : "type-390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mGlobalState",
+     "field_offset" : 512,
+     "referenced_type" : "type-2282"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BufferedTextOutput",
+   "name" : "android::hardware::BufferedTextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
+   "size" : 72,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecm"
+    }
+   ]
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-664"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-32"
+     "referenced_type" : "type-665"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-663",
+   "self_type" : "type-663",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-38" ],
+   "template_args" : [ "type-309", "type-368" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -21413,23 +33919,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-670"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-671"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-669",
+   "self_type" : "type-669",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-45" ],
+   "template_args" : [ "type-309", "type-29" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -21439,23 +33945,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-327"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-328"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-795", "type-797" ],
+   "template_args" : [ "type-329", "type-331" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -21465,23 +33971,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-589"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-329"
+     "referenced_type" : "type-590"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-330", "type-331" ],
+   "template_args" : [ "type-591", "type-592" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -21491,23 +33997,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-322"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-323"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-324", "type-325" ],
+   "template_args" : [ "type-350", "type-351" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -21516,50 +34022,99 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-78"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBytesPerLine",
+     "field_offset" : 128,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSingleLineCutoff",
+     "field_offset" : 192,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlignment",
+     "field_offset" : 256,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCArrayStyle",
+     "field_offset" : 320,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "linker_set_key" : "android::hardware::HexDump",
+   "name" : "android::hardware::HexDump",
+   "record_kind" : "class",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-60"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-349",
-   "self_type" : "type-349",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -21636,19 +34191,439 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2139",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-450"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 384,
+     "referenced_type" : "type-381"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 704,
+     "referenced_type" : "type-382"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-381"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 1344,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 2432,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 3520,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 3552,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 3584,
+     "referenced_type" : "type-41"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 3648,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 3680,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 3712,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 3776,
+     "referenced_type" : "type-426"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 3840,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 3848,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 3904,
+     "referenced_type" : "type-2247"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 4096,
+     "referenced_type" : "type-2248"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 4160,
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
+   "size" : 528,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -21660,42 +34635,409 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-275"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mQuantum",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 64,
+     "referenced_type" : "type-2160"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 256,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 320,
+     "referenced_type" : "type-231"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 384,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 448,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 512,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 576,
+     "referenced_type" : "type-2161"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 640,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 704,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 768,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 832,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 896,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 904,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 912,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 960,
+     "referenced_type" : "type-2162"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 1024,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2159",
+   "size" : 136,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-389"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-389"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 128,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 192,
+     "referenced_type" : "type-2251"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 512,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 896,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 960,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-265"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 1088,
+     "referenced_type" : "type-390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 1408,
+     "referenced_type" : "type-378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 1728,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 1792,
+     "referenced_type" : "type-2243"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 1856,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 1920,
+     "referenced_type" : "type-383"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 2240,
+     "referenced_type" : "type-165"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 2304,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 2312,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 2336,
+     "referenced_type" : "type-2148"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 2368,
+     "referenced_type" : "type-190"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2432,
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
+   "size" : 328,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 312,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -312,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -312,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2140"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21704,17 +35046,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-501"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "record_kind" : "class",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -21722,7 +35064,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21731,17 +35073,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-173" ],
+   "template_args" : [ "type-300" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -21749,7 +35091,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21758,17 +35100,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-258" ],
+   "template_args" : [ "type-527" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -21776,7 +35118,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21785,17 +35127,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-543"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-146" ],
+   "template_args" : [ "type-543" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -21803,7 +35145,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21812,17 +35154,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-532"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-111" ],
+   "template_args" : [ "type-532" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -21830,7 +35172,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21839,17 +35181,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-549" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -21857,7 +35199,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21866,17 +35208,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-538"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2015",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-127" ],
+   "template_args" : [ "type-538" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -21884,7 +35226,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21893,17 +35235,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -21911,17 +35253,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -21931,48 +35273,131 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput",
+   "name" : "android::hardware::TextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTO",
+     "referenced_type" : "type-2287"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TextOutput::Bundle",
+   "name" : "android::hardware::TextOutput::Bundle",
+   "record_kind" : "class",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCode",
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TypeCode",
+   "name" : "android::hardware::TypeCode",
+   "record_kind" : "class",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-30" ],
+   "template_args" : [ "type-663" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
   },
   {
@@ -21982,17 +35407,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-669" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
   },
   {
@@ -22002,17 +35427,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-326" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
   },
   {
@@ -22022,17 +35447,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-602",
+   "self_type" : "type-602",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-327" ],
+   "template_args" : [ "type-588" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
   },
   {
@@ -22042,17 +35467,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-321" ],
+   "template_args" : [ "type-347" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
   },
   {
@@ -22063,31 +35488,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 64,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-129"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 256,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 320,
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-130"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 512,
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-131"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 88,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -22116,18 +35541,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -22139,14 +35564,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -22155,8 +35580,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -22165,8 +35590,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -22175,8 +35600,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -22188,19 +35613,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-261"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -22212,19 +35637,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-794"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-793",
+   "self_type" : "type-793",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -22235,16 +35660,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-459"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-262" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22253,16 +35678,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-969"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-971" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -22271,16 +35696,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-573"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-572",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -22289,16 +35714,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-793"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-792",
+   "self_type" : "type-792",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-503" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -22307,16 +35732,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-985"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -22326,19 +35751,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-186"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -22349,16 +35774,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-40"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -22368,19 +35793,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -22391,16 +35816,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-10"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-9",
+   "self_type" : "type-9",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -22410,19 +35835,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -22434,19 +35859,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-970"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEUt_E"
@@ -22458,19 +35883,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-573",
+   "self_type" : "type-573",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -22481,16 +35906,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -22500,19 +35925,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -22523,16 +35948,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-13" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -22542,19 +35967,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -22576,20 +36001,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-103"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -22598,11 +36023,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 32>",
    "name" : "android::hardware::details::std_array<unsigned char, 32>",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-987",
+   "self_type" : "type-987",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLm32EJEEE"
   },
   {
@@ -22612,16 +36037,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-972"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLm32EJEEE"
   },
   {
@@ -22629,7 +36054,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-310"
     }
    ],
    "fields" :
@@ -22638,25 +36063,25 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 64,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-307"
     },
     {
      "access" : "private",
      "field_name" : "mCookie",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 256,
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -22736,13 +36161,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -22824,19 +36249,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-9"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -22848,25 +36273,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -22878,25 +36303,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -22908,28 +36333,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-262" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22939,28 +36364,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-968"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-971" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -22970,28 +36395,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-425"
+     "referenced_type" : "type-572"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-571",
+   "self_type" : "type-571",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -23001,28 +36426,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-792"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-791",
+   "self_type" : "type-791",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-503" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -23032,28 +36457,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-984"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-983",
+   "self_type" : "type-983",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -23061,7 +36486,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-992"
+     "referenced_type" : "type-577"
     }
    ],
    "fields" :
@@ -23069,14 +36494,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "record_kind" : "class",
-   "referenced_type" : "type-991",
-   "self_type" : "type-991",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -23088,28 +36513,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -23119,19 +36544,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -23141,10 +36566,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23153,13 +36578,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 960,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 144,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BnHwBaseE",
@@ -23281,10 +36706,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23293,19 +36718,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-370"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-371"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE",
@@ -23488,10 +36913,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23500,19 +36925,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-862"
+     "referenced_type" : "type-411"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2061",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE",
@@ -23638,23 +37063,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -23665,13 +37090,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-302",
+   "self_type" : "type-302",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -23780,7 +37205,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23789,13 +37214,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE",
@@ -23917,7 +37342,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23926,13 +37351,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-543"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE",
@@ -24054,10 +37479,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-832"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24066,19 +37491,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-830"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-831"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE",
@@ -24285,10 +37710,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24297,19 +37722,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-822"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-823"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE",
@@ -24495,10 +37920,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-505"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24507,19 +37932,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-530"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-916",
+   "self_type" : "type-916",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE",
@@ -24668,10 +38093,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-496"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24680,19 +38105,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-546"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE",
@@ -24820,13 +38245,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE",
@@ -24968,33 +38393,33 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-473"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 64,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
@@ -25004,13 +38429,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -25123,7 +38548,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25132,13 +38557,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-532"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE",
@@ -25260,10 +38685,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-841"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25272,19 +38697,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-839"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-840"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE",
@@ -25494,10 +38919,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25506,19 +38931,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-535"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE",
@@ -25670,13 +39095,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE",
@@ -25821,7 +39246,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25830,13 +39255,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE",
@@ -25958,7 +39383,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25967,13 +39392,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-538"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE",
@@ -26095,10 +39520,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-850"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26107,19 +39532,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-848"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-281"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE",
@@ -26305,10 +39730,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-730"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26317,19 +39742,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-728"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-729"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-727",
+   "self_type" : "type-727",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE",
@@ -26554,10 +39979,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-499"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26566,19 +39991,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-554"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE",
@@ -26706,10 +40131,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-518"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26718,19 +40143,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-541"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE",
@@ -26897,13 +40322,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE",
@@ -27016,13 +40441,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-515"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE",
@@ -27187,19 +40612,65 @@
    "fields" :
    [
     {
+     "field_name" : "key",
+     "referenced_type" : "type-287"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 64,
+     "referenced_type" : "type-384"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3621",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287", "type-384" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "key",
+     "referenced_type" : "type-78"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 64,
+     "referenced_type" : "type-2155"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2155" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-903"
+     "referenced_type" : "type-454"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-904" ],
+   "template_args" : [ "type-455" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -27209,17 +40680,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-877" ],
+   "template_args" : [ "type-427" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -27229,17 +40700,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-2282"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2284" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::HidlMemory>",
    "name" : "android::sp<android::hardware::HidlMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-349" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10HidlMemoryEEE"
   },
   {
@@ -27249,17 +40740,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-901"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-379" ],
+   "template_args" : [ "type-922" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -27269,37 +40760,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-73"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-385"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
    "referenced_type" : "type-384",
    "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-387" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-928"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IInterface>",
+   "name" : "android::sp<android::hardware::IInterface>",
+   "record_kind" : "class",
+   "referenced_type" : "type-927",
+   "self_type" : "type-927",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-930" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -27309,17 +40800,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-121" ],
+   "template_args" : [ "type-722" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -27329,17 +40820,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-895"
+     "referenced_type" : "type-446"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-897" ],
+   "template_args" : [ "type-448" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -27349,17 +40840,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-552"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
+   "referenced_type" : "type-556",
+   "self_type" : "type-556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-977" ],
+   "template_args" : [ "type-557" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -27369,17 +40860,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-738"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
    "name" : "android::sp<android::hardware::details::Waiter>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-744" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
   },
   {
@@ -27389,17 +40880,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-907",
+   "self_type" : "type-907",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-306" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -27409,17 +40900,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-82"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -27429,17 +40920,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-300",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -27449,17 +40940,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-505" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -27469,17 +40960,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-148" ],
+   "template_args" : [ "type-496" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -27489,17 +40980,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-515" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
   },
   {
@@ -27509,17 +41000,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-549",
+   "self_type" : "type-549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -27529,47 +41020,322 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-127",
-   "self_type" : "type-127",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-518" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
+   "name" : "android::trait_pointer<android::RefBase *>",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3561",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3560",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::String16>",
+   "name" : "android::trait_pointer<android::String16>",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3684",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3559",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3682",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3683",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3685",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<const void *>",
+   "name" : "android::trait_pointer<const void *>",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<int>",
+   "name" : "android::trait_pointer<int>",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3710",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
+   "name" : "android::trait_trivial_copy<android::RefBase *>",
+   "referenced_type" : "type-3554",
+   "self_type" : "type-3554",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3553",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
+   "name" : "android::trait_trivial_copy<android::String16>",
+   "referenced_type" : "type-3676",
+   "self_type" : "type-3676",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3550",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3675",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3678",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3677",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<const void *>",
+   "name" : "android::trait_trivial_copy<const void *>",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27579,151 +41345,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-724" ],
+   "template_args" : [ "type-238" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-225",
+   "self_type" : "type-225",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-276",
+   "self_type" : "type-276",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-265" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-389" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase *>",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3496",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3483",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
+   "name" : "android::trait_trivial_ctor<android::String16>",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3667",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3471",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3665",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3666",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3670",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
+   "name" : "android::trait_trivial_ctor<const void *>",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27733,151 +41631,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-724" ],
+   "template_args" : [ "type-238" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-265" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-245",
+   "self_type" : "type-245",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-389" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase *>",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3549",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3539",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
+   "name" : "android::trait_trivial_dtor<android::String16>",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3672",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3527",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3671",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3674",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3673",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
+   "name" : "android::trait_trivial_dtor<const void *>",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27887,173 +41917,294 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-724" ],
+   "template_args" : [ "type-238" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-265" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-402",
+   "self_type" : "type-402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-389" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
+   "name" : "android::trait_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3558",
+   "self_type" : "type-3558",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3557",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-764" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3556",
+   "self_type" : "type-3556",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3679",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3681",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3680",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<const void *>",
+   "name" : "android::trait_trivial_move<const void *>",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-917",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28063,147 +42214,443 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-724" ],
+   "template_args" : [ "type-238" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-830",
-   "self_type" : "type-830",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-265" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-154",
+   "self_type" : "type-154",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
+   "referenced_type" : "type-421",
+   "self_type" : "type-421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-389" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase *>",
+   "name" : "android::traits<android::RefBase *>",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3564",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
+   "name" : "android::traits<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3563",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::String16>",
+   "name" : "android::traits<android::String16>",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3688",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
+   "name" : "android::traits<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3562",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3686",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3687",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3689",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<const void *>",
+   "name" : "android::traits<const void *>",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android6traitsIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<int>",
+   "name" : "android::traits<int>",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3711",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6traitsIiEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3427"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
+   "name" : "android::use_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3426",
+   "self_type" : "type-3426",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3425"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3424",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3423"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3422",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2208"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3629"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3628",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3631"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3630",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2206"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2344"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3693"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<int>",
+   "name" : "android::use_trivial_move<int>",
+   "referenced_type" : "type-3692",
+   "self_type" : "type-3692",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-800" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28213,23 +42660,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-901"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-353" ],
+   "template_args" : [ "type-904" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -28239,23 +42686,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-2140"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::hardware::IBinder>",
+   "name" : "android::wp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-2139" ],
+   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-82"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -28265,23 +42738,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-309",
+   "self_type" : "type-309",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28290,18 +42763,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -28312,23 +42785,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-228"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -28339,23 +42812,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-718"
+     "referenced_type" : "type-232"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-234"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 16,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -28366,48 +42839,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-231"
     },
     {
      "field_name" : "component",
      "field_offset" : 64,
-     "referenced_type" : "type-715"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -28418,38 +42891,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -28460,18 +42933,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -28482,43 +42955,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -28528,13 +43001,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -28545,35 +43018,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-181"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-177"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-665"
+     "referenced_type" : "type-176"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-663"
+     "referenced_type" : "type-174"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "record_kind" : "union",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
@@ -28584,18 +43057,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -28606,43 +43079,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -28653,48 +43126,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -28705,48 +43178,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -28757,53 +43230,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -28814,31 +43287,58 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lock",
+     "referenced_type" : "type-2323"
+    },
+    {
+     "field_name" : "has_tls",
+     "field_offset" : 320,
+     "referenced_type" : "type-14"
+    },
+    {
+     "field_name" : "tls",
+     "field_offset" : 352,
+     "referenced_type" : "type-14"
+    }
+   ],
+   "linker_set_key" : "thread_store_t",
+   "name" : "thread_store_t",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
+   "size" : 48,
+   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
+   "unique_id" : "thread_store_t"
   }
  ],
  "rvalue_reference_types" :
@@ -28847,8 +43347,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
-   "referenced_type" : "type-180",
-   "self_type" : "type-184",
+   "referenced_type" : "type-764",
+   "self_type" : "type-766",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28856,8 +43356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
-   "referenced_type" : "type-172",
-   "self_type" : "type-175",
+   "referenced_type" : "type-757",
+   "self_type" : "type-759",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28865,8 +43365,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
-   "referenced_type" : "type-402",
-   "self_type" : "type-404",
+   "referenced_type" : "type-944",
+   "self_type" : "type-946",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28874,8 +43374,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1055",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28883,8 +43383,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
-   "referenced_type" : "type-615",
-   "self_type" : "type-617",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1112",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28892,8 +43392,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1947",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28901,8 +43401,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2017",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28910,8 +43410,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-411",
-   "self_type" : "type-738",
+   "referenced_type" : "type-250",
+   "self_type" : "type-253",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28919,8 +43419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-104",
-   "self_type" : "type-494",
+   "referenced_type" : "type-120",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28928,8 +43428,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-106",
-   "self_type" : "type-414",
+   "referenced_type" : "type-103",
+   "self_type" : "type-109",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28937,8 +43437,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-38",
-   "self_type" : "type-41",
+   "referenced_type" : "type-368",
+   "self_type" : "type-668",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -28946,8 +43446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &&",
    "name" : "android::hardware::details::hidl_pointer<const char> &&",
-   "referenced_type" : "type-98",
-   "self_type" : "type-318",
+   "referenced_type" : "type-39",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -28955,8 +43455,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-105",
-   "self_type" : "type-452",
+   "referenced_type" : "type-112",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28964,8 +43464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-77",
-   "self_type" : "type-84",
+   "referenced_type" : "type-28",
+   "self_type" : "type-33",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28973,8 +43473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-203",
-   "self_type" : "type-227",
+   "referenced_type" : "type-60",
+   "self_type" : "type-65",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28982,8 +43482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string &&",
    "name" : "android::hardware::hidl_string &&",
-   "referenced_type" : "type-97",
-   "self_type" : "type-188",
+   "referenced_type" : "type-38",
+   "self_type" : "type-55",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28991,8 +43491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-206",
-   "self_type" : "type-207",
+   "referenced_type" : "type-473",
+   "self_type" : "type-784",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -29000,8 +43500,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-876",
-   "self_type" : "type-888",
+   "referenced_type" : "type-426",
+   "self_type" : "type-438",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29009,8 +43509,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> &&",
    "name" : "android::sp<android::hardware::HidlMemory> &&",
-   "referenced_type" : "type-347",
-   "self_type" : "type-377",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-921",
+   "self_type" : "type-2234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29018,8 +43527,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-72",
-   "self_type" : "type-887",
+   "referenced_type" : "type-384",
+   "self_type" : "type-437",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29027,8 +43536,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
-   "referenced_type" : "type-356",
-   "self_type" : "type-398",
+   "referenced_type" : "type-907",
+   "self_type" : "type-941",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29036,8 +43545,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-304",
-   "self_type" : "type-880",
+   "referenced_type" : "type-81",
+   "self_type" : "type-430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29045,8 +43554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-173",
-   "self_type" : "type-959",
+   "referenced_type" : "type-300",
+   "self_type" : "type-524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29054,8 +43563,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
-   "referenced_type" : "type-258",
-   "self_type" : "type-391",
+   "referenced_type" : "type-527",
+   "self_type" : "type-934",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29063,8 +43572,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
-   "referenced_type" : "type-146",
-   "self_type" : "type-396",
+   "referenced_type" : "type-543",
+   "self_type" : "type-939",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29072,8 +43581,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-532",
+   "self_type" : "type-716",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29081,8 +43590,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1713",
+   "referenced_type" : "type-549",
+   "self_type" : "type-1942",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29090,8 +43599,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
-   "referenced_type" : "type-127",
-   "self_type" : "type-300",
+   "referenced_type" : "type-538",
+   "self_type" : "type-867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29099,8 +43608,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-797",
-   "self_type" : "type-808",
+   "referenced_type" : "type-331",
+   "self_type" : "type-342",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29108,8 +43617,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-33",
-   "self_type" : "type-40",
+   "referenced_type" : "type-309",
+   "self_type" : "type-667",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29117,8 +43626,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-795",
-   "self_type" : "type-807",
+   "referenced_type" : "type-329",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29126,8 +43635,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29135,8 +43644,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29144,8 +43653,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29153,8 +43662,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29162,8 +43671,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29171,8 +43680,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1909",
+   "self_type" : "type-1908",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29180,8 +43689,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29189,8 +43698,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29198,8 +43707,62 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2993",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3050",
+   "self_type" : "type-3049",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3109",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29207,8 +43770,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29216,8 +43779,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29225,8 +43788,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29234,8 +43797,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1746",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1802",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29243,8 +43806,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29252,8 +43815,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29261,8 +43824,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29270,8 +43833,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29279,8 +43842,62 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2943",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2997",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3053",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3115",
+   "self_type" : "type-3114",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3187",
+   "self_type" : "type-3186",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29288,8 +43905,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29297,8 +43914,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29306,8 +43923,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29315,8 +43932,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29324,8 +43941,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29333,8 +43950,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1911",
+   "self_type" : "type-1910",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29342,8 +43959,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29351,8 +43968,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2047",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29360,8 +43977,62 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2995",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3111",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3185",
+   "self_type" : "type-3184",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/29/64/arm64_armv8-a/source-based/libhwbinder.so.lsdump b/29/64/arm64_armv8-a/source-based/libhwbinder.so.lsdump
deleted file mode 100644
index 40b7940..0000000
--- a/29/64/arm64_armv8-a/source-based/libhwbinder.so.lsdump
+++ /dev/null
@@ -1,16820 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-165",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [10]",
-   "name" : "char [10]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-728",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [11]",
-   "name" : "char [11]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-750",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [12]",
-   "name" : "char [12]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-724",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [13]",
-   "name" : "char [13]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-721",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [14]",
-   "name" : "char [14]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-769",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [15]",
-   "name" : "char [15]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-127",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-754",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [17]",
-   "name" : "char [17]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-772",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [18]",
-   "name" : "char [18]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-757",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [19]",
-   "name" : "char [19]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-788",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [20]",
-   "name" : "char [20]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-766",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [22]",
-   "name" : "char [22]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-791",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [25]",
-   "name" : "char [25]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-781",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [28]",
-   "name" : "char [28]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-803",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [29]",
-   "name" : "char [29]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-778",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [2]",
-   "name" : "char [2]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-732",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [31]",
-   "name" : "char [31]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-763",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-794",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [35]",
-   "name" : "char [35]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-785",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [37]",
-   "name" : "char [37]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-775",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [3]",
-   "name" : "char [3]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-744",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4]",
-   "name" : "char [4]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [5]",
-   "name" : "char [5]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-131",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [6]",
-   "name" : "char [6]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-735",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [7]",
-   "name" : "char [7]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-760",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [8]",
-   "name" : "char [8]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-747",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [9]",
-   "name" : "char [9]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-738",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-102",
-   "self_type" : "type-236",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-9",
-   "self_type" : "type-90",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-11",
-   "self_type" : "type-174",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-4",
-   "self_type" : "type-224",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
-   "size" : 1
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char16_t",
-   "name" : "char16_t",
-   "referenced_type" : "type-292",
-   "self_type" : "type-292",
-   "size" : 2
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEm"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEmPm"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEmb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC1Em"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC2Em"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhmPKymPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEl"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt64El"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11finishWriteEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11setDataSizeEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvmPm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint64Em"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12restartWriteEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeInplaceEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writePointerEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13continueWriteEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPmmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhmPKymPFvPS1_S3_mS5_mPvES7_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvmPmmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPmmmmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlemm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPmmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel5writeEPKvm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel6removeEmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel7setDataEPKhm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8growDataEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9initStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC1EPKvmm"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC2EPKvmm"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64EPm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readInplaceEm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEPm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPmPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEmPmmmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEmPmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectmjmm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEmm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEmm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPmmmPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEmmPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEmPmmmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebmm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEmmPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4dataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4readEPvm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64EPl"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
-  },
-  {
-   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_m"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "getHWBinderKernelReferences"
-  },
-  {
-   "name" : "printHexData"
-  },
-  {
-   "name" : "printTypeCode"
-  },
-  {
-   "name" : "stringForIndent"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "name" : "_ZN7android8hardware12gTextBuffersE"
-  },
-  {
-   "name" : "_ZN7android8hardware13gProcessMutexE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aerrE"
-  },
-  {
-   "name" : "_ZN7android8hardware4alogE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aoutE"
-  },
-  {
-   "name" : "_ZN7android8hardware8gProcessE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10IInterfaceE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware12ProcessStateE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIiEE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10IInterfaceE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware10PoolThreadE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10TextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware12FdTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware12ProcessStateE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware13LogTextOutputE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String16::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String16::StaticLinkage",
-   "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
-   "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-9",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-587"
-    }
-   ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-587",
-   "self_type" : "type-591",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-380"
-    },
-    {
-     "referenced_type" : "type-153"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "referenced_type" : "type-379",
-   "return_type" : "type-14",
-   "self_type" : "type-379",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "referenced_type" : "type-243",
-   "return_type" : "type-9",
-   "self_type" : "type-243",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-599"
-    }
-   ],
-   "referenced_type" : "type-598",
-   "return_type" : "type-599",
-   "self_type" : "type-598",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "referenced_type" : "type-16",
-   "return_type" : "type-17",
-   "self_type" : "type-16",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (const void *, void *, void *)",
-   "name" : "void (const void *, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "referenced_type" : "type-288",
-   "return_type" : "type-17",
-   "self_type" : "type-288",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-383"
-    }
-   ],
-   "referenced_type" : "type-655",
-   "return_type" : "type-17",
-   "self_type" : "type-655",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-550"
-    },
-    {
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-372",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-665"
-    },
-    {
-     "referenced_type" : "type-70"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-665"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-485"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-59",
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-514"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-657",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::sendObituary",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-121"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-128"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-524"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-821"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-668"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-661"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-664"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-664"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-664"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-664"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
-   "return_type" : "type-373",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMaxThreads",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::startThreadPool",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-380"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-373",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-153"
-    },
-    {
-     "referenced_type" : "type-380"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-325",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setCallRestriction",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-385"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getKernelReferences",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEmPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::becomeContextManager",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-378"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-382",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEmb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::self",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
-   "return_type" : "type-373",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Em",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Em",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhmPKymPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
-   "return_type" : "type-708",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::clearCaller",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::stopProcess",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setupPolling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-712"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::flushCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearLastError",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::executeCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-712"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-715"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-545"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-712"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEl",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::self",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
-   "return_type" : "type-708",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::process",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-373",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::shutdown",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::transact",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::sendReply",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::release_object",
-   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-687"
-    },
-    {
-     "referenced_type" : "type-87"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
-   "return_type" : "type-616",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::print",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    },
-    {
-     "referenced_type" : "type-383"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeFloat",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-95"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64El",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-11"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::finishWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvmPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeDouble",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeObject",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-87"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-822" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Em",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::restartWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeCString",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-383"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInplace",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-23",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::writePointer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::continueWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-290"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-380"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-80"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUnpadded",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::acquireObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::freeDataNoInit",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::releaseObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataCapacity",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeWeakBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-54"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeStrongBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhmPKymPFvPS1_S3_mS5_mPvES7_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-15"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvmPmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-383"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
-   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::incrementNumReferences",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPmmmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-91"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-91"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
-   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlemm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-91"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::write",
-   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::remove",
-   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::freeData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::growData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setError",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::initState",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBool",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-595"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-595"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-36",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-657",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::onTransact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-823"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-55"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-36",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-121"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-128"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-139",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-824"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-587"
-    },
-    {
-     "referenced_type" : "type-453"
-    }
-   ],
-   "return_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-587"
-    },
-    {
-     "referenced_type" : "type-450"
-    }
-   ],
-   "return_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-293"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-23",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-538"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-23",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::isContextManager",
-   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-393"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-383",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isServingCall",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
-   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-619"
-    }
-   ],
-   "return_type" : "type-582",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::clearCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::errorCheck",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::findBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-105"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-104",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-108",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-826" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-96"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::scanForFds",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcDataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readCString",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-383",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-110",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::updateCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataCapacity",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::objectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-639"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-106"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-289",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcBufferSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPmPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readWeakBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::quickFindBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::enforceInterface",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-383"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-665"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEmPmmmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEmPmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::verifyBufferObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectmjmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-115"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16Inplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-290",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferChild",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferParent",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPmmmPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEmmPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-665"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEmPmmmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-112"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEmmPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::data",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::read",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::print",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-587"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcData",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::objects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-92"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataAvail",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-102",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-94"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-712"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPl",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::checkSubclass",
-   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-647"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-136"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-23",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::getHWBinderKernelReferences",
-   "linker_set_key" : "getHWBinderKernelReferences",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printHexData",
-   "linker_set_key" : "printHexData",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-9"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-656"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printTypeCode",
-   "linker_set_key" : "printTypeCode",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-656"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::stringForIndent",
-   "linker_set_key" : "stringForIndent",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-383",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "global_vars" :
- [
-  {
-   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
-   "name" : "android::hardware::gTextBuffers",
-   "referenced_type" : "type-622",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
-   "name" : "android::hardware::gProcessMutex",
-   "referenced_type" : "type-254",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aerrE",
-   "name" : "android::hardware::aerr",
-   "referenced_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4alogE",
-   "name" : "android::hardware::alog",
-   "referenced_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aoutE",
-   "name" : "android::hardware::aout",
-   "referenced_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware8gProcessE",
-   "name" : "android::hardware::gProcess",
-   "referenced_type" : "type-827",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  }
- ],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-254",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-261",
-   "self_type" : "type-267",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase *const &",
-   "name" : "android::RefBase *const &",
-   "referenced_type" : "type-676",
-   "self_type" : "type-699",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type *const &",
-   "name" : "android::RefBase::weakref_type *const &",
-   "referenced_type" : "type-674",
-   "self_type" : "type-695",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String16 &",
-   "name" : "android::String16 &",
-   "referenced_type" : "type-289",
-   "self_type" : "type-632",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-566",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *const &",
-   "name" : "android::hardware::BHwBinder *const &",
-   "referenced_type" : "type-672",
-   "self_type" : "type-691",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::HexDump &",
-   "name" : "android::hardware::HexDump &",
-   "referenced_type" : "type-455",
-   "self_type" : "type-596",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
-   "name" : "android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-326",
-   "self_type" : "type-360",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-161",
-   "self_type" : "type-160",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-448",
-   "self_type" : "type-587",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-323",
-   "self_type" : "type-337",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-487",
-   "self_type" : "type-500",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
-   "name" : "android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-545",
-   "self_type" : "type-705",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-606",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &",
-   "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-72",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
-   "name" : "android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-82",
-   "self_type" : "type-510",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
-   "name" : "android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-52",
-   "self_type" : "type-59",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char *const &",
-   "name" : "char *const &",
-   "referenced_type" : "type-118",
-   "self_type" : "type-122",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[10]",
-   "name" : "char const (&)[10]",
-   "referenced_type" : "type-727",
-   "self_type" : "type-729",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[11]",
-   "name" : "char const (&)[11]",
-   "referenced_type" : "type-749",
-   "self_type" : "type-751",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[12]",
-   "name" : "char const (&)[12]",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[13]",
-   "name" : "char const (&)[13]",
-   "referenced_type" : "type-720",
-   "self_type" : "type-722",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[14]",
-   "name" : "char const (&)[14]",
-   "referenced_type" : "type-768",
-   "self_type" : "type-770",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[15]",
-   "name" : "char const (&)[15]",
-   "referenced_type" : "type-126",
-   "self_type" : "type-129",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[16]",
-   "name" : "char const (&)[16]",
-   "referenced_type" : "type-753",
-   "self_type" : "type-755",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[17]",
-   "name" : "char const (&)[17]",
-   "referenced_type" : "type-771",
-   "self_type" : "type-773",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[18]",
-   "name" : "char const (&)[18]",
-   "referenced_type" : "type-756",
-   "self_type" : "type-758",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[19]",
-   "name" : "char const (&)[19]",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[20]",
-   "name" : "char const (&)[20]",
-   "referenced_type" : "type-765",
-   "self_type" : "type-767",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[22]",
-   "name" : "char const (&)[22]",
-   "referenced_type" : "type-790",
-   "self_type" : "type-792",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[25]",
-   "name" : "char const (&)[25]",
-   "referenced_type" : "type-780",
-   "self_type" : "type-782",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[28]",
-   "name" : "char const (&)[28]",
-   "referenced_type" : "type-802",
-   "self_type" : "type-804",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[29]",
-   "name" : "char const (&)[29]",
-   "referenced_type" : "type-777",
-   "self_type" : "type-779",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[2]",
-   "name" : "char const (&)[2]",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[31]",
-   "name" : "char const (&)[31]",
-   "referenced_type" : "type-762",
-   "self_type" : "type-764",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[32]",
-   "name" : "char const (&)[32]",
-   "referenced_type" : "type-793",
-   "self_type" : "type-796",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[35]",
-   "name" : "char const (&)[35]",
-   "referenced_type" : "type-784",
-   "self_type" : "type-786",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[37]",
-   "name" : "char const (&)[37]",
-   "referenced_type" : "type-774",
-   "self_type" : "type-776",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[3]",
-   "name" : "char const (&)[3]",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[4]",
-   "name" : "char const (&)[4]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-125",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[5]",
-   "name" : "char const (&)[5]",
-   "referenced_type" : "type-130",
-   "self_type" : "type-132",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[6]",
-   "name" : "char const (&)[6]",
-   "referenced_type" : "type-734",
-   "self_type" : "type-736",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[7]",
-   "name" : "char const (&)[7]",
-   "referenced_type" : "type-759",
-   "self_type" : "type-761",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[8]",
-   "name" : "char const (&)[8]",
-   "referenced_type" : "type-746",
-   "self_type" : "type-748",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[9]",
-   "name" : "char const (&)[9]",
-   "referenced_type" : "type-737",
-   "self_type" : "type-739",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-555",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
-   "name" : "const android::hardware::BpHwBinder::Obituary &",
-   "referenced_type" : "type-494",
-   "self_type" : "type-524",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "referenced_type" : "type-501",
-   "self_type" : "type-502",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::HexDump &",
-   "name" : "const android::hardware::HexDump &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-5",
-   "self_type" : "type-45",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
-   "name" : "const android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-361",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::TypeCode &",
-   "name" : "const android::hardware::TypeCode &",
-   "referenced_type" : "type-451",
-   "self_type" : "type-450",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-322",
-   "self_type" : "type-324",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-486",
-   "self_type" : "type-488",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
-   "name" : "const android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-709",
-   "self_type" : "type-718",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-605",
-   "self_type" : "type-604",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-147",
-   "self_type" : "type-149",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-49",
-   "self_type" : "type-55",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-512",
-   "self_type" : "type-514",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-203",
-   "self_type" : "type-205",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-218",
-   "self_type" : "type-220",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-652",
-   "self_type" : "type-654",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
-   "name" : "const android::sp<android::hardware::IInterface> &",
-   "referenced_type" : "type-662",
-   "self_type" : "type-661",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
-   "name" : "const android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-544",
-   "self_type" : "type-687",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-81",
-   "self_type" : "type-121",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-477",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char &",
-   "name" : "const char &",
-   "referenced_type" : "type-384",
-   "self_type" : "type-602",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *const &",
-   "name" : "const char *const &",
-   "referenced_type" : "type-589",
-   "self_type" : "type-590",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-330",
-   "self_type" : "type-503",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-302",
-   "self_type" : "type-304",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-85",
-   "self_type" : "type-87",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-297",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-277",
-   "self_type" : "type-645",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-176",
-   "self_type" : "type-178",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const long &",
-   "name" : "const long &",
-   "referenced_type" : "type-138",
-   "self_type" : "type-175",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-481",
-   "self_type" : "type-482",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-479",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-251",
-   "self_type" : "type-255",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-301",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-78",
-   "self_type" : "type-80",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-480",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char *const &",
-   "name" : "const unsigned char *const &",
-   "referenced_type" : "type-797",
-   "self_type" : "type-798",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long &",
-   "name" : "const unsigned long &",
-   "referenced_type" : "type-187",
-   "self_type" : "type-231",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long *const &",
-   "name" : "const unsigned long *const &",
-   "referenced_type" : "type-799",
-   "self_type" : "type-801",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-22",
-   "self_type" : "type-726",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-483",
-   "self_type" : "type-484",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void *const &",
-   "name" : "const void *const &",
-   "referenced_type" : "type-489",
-   "self_type" : "type-490",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int &",
-   "name" : "int &",
-   "referenced_type" : "type-9",
-   "self_type" : "type-626",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-134",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-265",
-   "self_type" : "type-264",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-436",
-   "self_type" : "type-435",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-600",
-   "self_type" : "type-599",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *const &",
-   "name" : "void *const &",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-811",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-28",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-260",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-249",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-282",
-   "self_type" : "type-528",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-248",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-258",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-263",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-266",
-   "self_type" : "type-268",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-269",
-   "self_type" : "type-273",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase **",
-   "name" : "android::RefBase **",
-   "referenced_type" : "type-30",
-   "self_type" : "type-671",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase *const *",
-   "name" : "android::RefBase *const *",
-   "referenced_type" : "type-676",
-   "self_type" : "type-677",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-271",
-   "self_type" : "type-270",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-426",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-507",
-   "self_type" : "type-506",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type **",
-   "name" : "android::RefBase::weakref_type **",
-   "referenced_type" : "type-25",
-   "self_type" : "type-670",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type *const *",
-   "name" : "android::RefBase::weakref_type *const *",
-   "referenced_type" : "type-674",
-   "self_type" : "type-675",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-504",
-   "self_type" : "type-505",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-515",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-639",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-577",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::RefBase *> *",
-   "name" : "android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-696",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-692",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-701",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-688",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-256",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-521",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-716",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-75",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-629",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-627",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-421",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder **",
-   "name" : "android::hardware::BHwBinder **",
-   "referenced_type" : "type-36",
-   "self_type" : "type-669",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *const *",
-   "name" : "android::hardware::BHwBinder *const *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-673",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BpHwBinder *",
-   "name" : "android::hardware::BpHwBinder *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-657",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
-   "name" : "android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-492",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-536",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BpHwRefBase *",
-   "name" : "android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-150",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput *",
-   "name" : "android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-613",
-   "self_type" : "type-614",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-192",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::HexDump *",
-   "name" : "android::hardware::HexDump *",
-   "referenced_type" : "type-455",
-   "self_type" : "type-595",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder *",
-   "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-53",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-298",
-   "self_type" : "type-664",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IPCThreadState *",
-   "name" : "android::hardware::IPCThreadState *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-708",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-18",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::ProcessState *",
-   "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
-   "name" : "android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-592",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput *",
-   "name" : "android::hardware::TextOutput *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
-   "name" : "android::hardware::TextOutput::Bundle *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-588",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TypeCode *",
-   "name" : "android::hardware::TypeCode *",
-   "referenced_type" : "type-452",
-   "self_type" : "type-593",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-323",
-   "self_type" : "type-327",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-491",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::Thread> *",
-   "name" : "android::sp<android::Thread> *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-346",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
-   "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-545",
-   "self_type" : "type-704",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-611",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-533",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> *",
-   "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
-   "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-550",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-128",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
-   "name" : "android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-485",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-105",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-366",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-530",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-511",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-354",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-517",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-615",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-549",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::RefBase *> *",
-   "name" : "const android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-698",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-694",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-703",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-690",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-359",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-630",
-   "self_type" : "type-631",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-624",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-190",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BHwBinder *",
-   "name" : "const android::hardware::BHwBinder *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-136",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder *",
-   "name" : "const android::hardware::BpHwBinder *",
-   "referenced_type" : "type-275",
-   "self_type" : "type-293",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
-   "name" : "const android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-495",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-538",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwRefBase *",
-   "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-156",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
-   "name" : "const android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-619",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::HexDump *",
-   "name" : "const android::hardware::HexDump *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-597",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-646",
-   "self_type" : "type-647",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
-   "name" : "const android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-531",
-   "self_type" : "type-532",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IInterface *",
-   "name" : "const android::hardware::IInterface *",
-   "referenced_type" : "type-667",
-   "self_type" : "type-668",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IPCThreadState *",
-   "name" : "const android::hardware::IPCThreadState *",
-   "referenced_type" : "type-710",
-   "self_type" : "type-711",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Parcel *",
-   "name" : "const android::hardware::Parcel *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-77",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::ProcessState *",
-   "name" : "const android::hardware::ProcessState *",
-   "referenced_type" : "type-392",
-   "self_type" : "type-393",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
-   "name" : "const android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::TypeCode *",
-   "name" : "const android::hardware::TypeCode *",
-   "referenced_type" : "type-451",
-   "self_type" : "type-594",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-332",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-493",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::Thread> *",
-   "name" : "const android::sp<android::Thread> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-365",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
-   "name" : "const android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-709",
-   "self_type" : "type-719",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-612",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-512",
-   "self_type" : "type-535",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
-   "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-806",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
-   "name" : "const android::sp<android::hardware::IInterface> *",
-   "referenced_type" : "type-662",
-   "self_type" : "type-666",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
-   "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-551",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-520",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
-   "name" : "const android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-69",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-115",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char16_t *",
-   "name" : "const char16_t *",
-   "referenced_type" : "type-291",
-   "self_type" : "type-290",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-308",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-108",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-277",
-   "self_type" : "type-625",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-177",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-91",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-91",
-   "self_type" : "type-112",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long *",
-   "name" : "const unsigned long *",
-   "referenced_type" : "type-187",
-   "self_type" : "type-800",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long long *",
-   "name" : "const unsigned long long *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void **",
-   "name" : "const void **",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double *",
-   "name" : "double *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "float *",
-   "name" : "float *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-243",
-   "self_type" : "type-244",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-712",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-184",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long *",
-   "name" : "long *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "short *",
-   "name" : "short *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "signed char *",
-   "name" : "signed char *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "referenced_type" : "type-598",
-   "self_type" : "type-601",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-98",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long *",
-   "name" : "unsigned long *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-651",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long long *",
-   "name" : "unsigned long long *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned short *",
-   "name" : "unsigned short *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void (*)(const void *, void *, void *)",
-   "name" : "void (*)(const void *, void *, void *)",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-655",
-   "self_type" : "type-656",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-23",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-23",
-   "self_type" : "type-246",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase *const",
-   "name" : "android::RefBase *const",
-   "referenced_type" : "type-30",
-   "self_type" : "type-676",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-166",
-   "self_type" : "type-168",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-197",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-210",
-   "self_type" : "type-212",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-225",
-   "self_type" : "type-227",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-237",
-   "self_type" : "type-239",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-270",
-   "self_type" : "type-272",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-341",
-   "self_type" : "type-343",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-426",
-   "self_type" : "type-429",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-506",
-   "self_type" : "type-508",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-56",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-607",
-   "self_type" : "type-609",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-648",
-   "self_type" : "type-650",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-658",
-   "self_type" : "type-660",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-684",
-   "self_type" : "type-686",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_type *const",
-   "name" : "android::RefBase::weakref_type *const",
-   "referenced_type" : "type-25",
-   "self_type" : "type-674",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::BHwBinder *const",
-   "name" : "android::hardware::BHwBinder *const",
-   "referenced_type" : "type-36",
-   "self_type" : "type-672",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::IBinder *const",
-   "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-53",
-   "self_type" : "type-145",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "char *const",
-   "name" : "char *const",
-   "referenced_type" : "type-119",
-   "self_type" : "type-118",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[10]",
-   "name" : "char const[10]",
-   "referenced_type" : "type-728",
-   "self_type" : "type-727",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[11]",
-   "name" : "char const[11]",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[12]",
-   "name" : "char const[12]",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[13]",
-   "name" : "char const[13]",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[14]",
-   "name" : "char const[14]",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[15]",
-   "name" : "char const[15]",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[16]",
-   "name" : "char const[16]",
-   "referenced_type" : "type-754",
-   "self_type" : "type-753",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[17]",
-   "name" : "char const[17]",
-   "referenced_type" : "type-772",
-   "self_type" : "type-771",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[18]",
-   "name" : "char const[18]",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[19]",
-   "name" : "char const[19]",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[20]",
-   "name" : "char const[20]",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[22]",
-   "name" : "char const[22]",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[25]",
-   "name" : "char const[25]",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[28]",
-   "name" : "char const[28]",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[29]",
-   "name" : "char const[29]",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[2]",
-   "name" : "char const[2]",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[31]",
-   "name" : "char const[31]",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[32]",
-   "name" : "char const[32]",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[35]",
-   "name" : "char const[35]",
-   "referenced_type" : "type-785",
-   "self_type" : "type-784",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[37]",
-   "name" : "char const[37]",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[3]",
-   "name" : "char const[3]",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[4]",
-   "name" : "char const[4]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[5]",
-   "name" : "char const[5]",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[6]",
-   "name" : "char const[6]",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[7]",
-   "name" : "char const[7]",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[8]",
-   "name" : "char const[8]",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[9]",
-   "name" : "char const[9]",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-810",
-   "self_type" : "type-812",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-363",
-   "self_type" : "type-364",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-282",
-   "self_type" : "type-529",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-31",
-   "self_type" : "type-509",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-351",
-   "self_type" : "type-353",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-516",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-289",
-   "self_type" : "type-381",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-382",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase *>",
-   "name" : "const android::Vector<android::RefBase *>",
-   "referenced_type" : "type-527",
-   "self_type" : "type-697",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
-   "name" : "const android::Vector<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-693",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-702",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
-   "name" : "const android::Vector<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-689",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-519",
-   "self_type" : "type-522",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-358",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-628",
-   "self_type" : "type-630",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<int>",
-   "name" : "const android::Vector<int>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BHwBinder",
-   "name" : "const android::hardware::BHwBinder",
-   "referenced_type" : "type-37",
-   "self_type" : "type-133",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder",
-   "name" : "const android::hardware::BpHwBinder",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
-   "size" : 144,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
-   "name" : "const android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-294",
-   "self_type" : "type-494",
-   "size" : 32,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager",
-   "referenced_type" : "type-281",
-   "self_type" : "type-537",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-286",
-   "self_type" : "type-501",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwRefBase",
-   "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-144",
-   "self_type" : "type-155",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput",
-   "name" : "const android::hardware::BufferedTextOutput",
-   "referenced_type" : "type-613",
-   "self_type" : "type-618",
-   "size" : 72,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::HexDump",
-   "name" : "const android::hardware::HexDump",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder",
-   "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-39",
-   "self_type" : "type-646",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
-   "name" : "const android::hardware::IBinder::DeathRecipient",
-   "referenced_type" : "type-84",
-   "self_type" : "type-531",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IInterface",
-   "name" : "const android::hardware::IInterface",
-   "referenced_type" : "type-298",
-   "self_type" : "type-667",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IPCThreadState",
-   "name" : "const android::hardware::IPCThreadState",
-   "referenced_type" : "type-543",
-   "self_type" : "type-710",
-   "size" : 528,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "size" : 136,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState",
-   "name" : "const android::hardware::ProcessState",
-   "referenced_type" : "type-375",
-   "self_type" : "type-392",
-   "size" : 328,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
-   "name" : "const android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-326",
-   "self_type" : "type-328",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::TypeCode",
-   "name" : "const android::hardware::TypeCode",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
-   "size" : 32,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Thread>",
-   "name" : "const android::sp<android::Thread>",
-   "referenced_type" : "type-60",
-   "self_type" : "type-357",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
-   "name" : "const android::sp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-545",
-   "self_type" : "type-709",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "referenced_type" : "type-581",
-   "self_type" : "type-605",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-71",
-   "self_type" : "type-154",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
-   "name" : "const android::sp<android::hardware::IInterface>",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
-   "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-373",
-   "self_type" : "type-544",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
-   "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-14",
-   "self_type" : "type-63",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-120",
-   "self_type" : "type-384",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-383",
-   "self_type" : "type-589",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const char16_t",
-   "name" : "const char16_t",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-104",
-   "self_type" : "type-330",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-102",
-   "self_type" : "type-245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-9",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-172",
-   "self_type" : "type-176",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long",
-   "name" : "const long",
-   "referenced_type" : "type-100",
-   "self_type" : "type-138",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-95",
-   "self_type" : "type-481",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-93",
-   "self_type" : "type-478",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-11",
-   "self_type" : "type-20",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char *const",
-   "name" : "const unsigned char *const",
-   "referenced_type" : "type-19",
-   "self_type" : "type-797",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long",
-   "name" : "const unsigned long",
-   "referenced_type" : "type-7",
-   "self_type" : "type-187",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long *const",
-   "name" : "const unsigned long *const",
-   "referenced_type" : "type-800",
-   "self_type" : "type-799",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-13",
-   "self_type" : "type-22",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-97",
-   "self_type" : "type-483",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-111",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const void *const",
-   "name" : "const void *const",
-   "referenced_type" : "type-110",
-   "self_type" : "type-489",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-740",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-14",
-   "self_type" : "type-68",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile int",
-   "name" : "volatile int",
-   "referenced_type" : "type-9",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-504"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "d_",
-     "field_offset" : 64,
-     "referenced_type" : "type-611"
-    },
-    {
-     "access" : "private",
-     "field_name" : "s_",
-     "field_offset" : 128,
-     "referenced_type" : "type-612"
-    }
-   ],
-   "linker_set_key" : "Renamer",
-   "name" : "Renamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer"
-    },
-    {
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mENK7RenamerclEm"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mEN7RenamerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mEN7RenamerD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-700"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-351"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-289", "type-71" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-283"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-110", "type-286" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-3" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-262"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
-   "size" : 56,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-267"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-267"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-284"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "record_kind" : "class",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-352" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-284"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-285" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_m"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_m"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_m"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_m"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-290"
-    }
-   ],
-   "linker_set_key" : "android::String16",
-   "name" : "android::String16",
-   "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "unique_id" : "_ZTSN7android8String16E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-383"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 64,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 192,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 512,
-     "referenced_type" : "type-66"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 896,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 928,
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 936,
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 960,
-     "referenced_type" : "type-60"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 1024,
-     "referenced_type" : "type-9"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 152,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 136,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcim"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -136,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -136,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase *>",
-   "name" : "android::Vector<android::RefBase *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
-   "name" : "android::Vector<android::RefBase::weakref_type *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-382" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
-   "name" : "android::Vector<android::hardware::BHwBinder *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "record_kind" : "class",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<int>",
-   "name" : "android::Vector<int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android6VectorIiEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 192,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 256,
-     "referenced_type" : "type-187"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289", "type-71" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110", "type-286" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-39"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPriority",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExtras",
-     "field_offset" : 128,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReserved0",
-     "field_offset" : 192,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BHwBinder",
-   "name" : "android::hardware::BHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-39"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mHandle",
-     "field_offset" : 64,
-     "referenced_type" : "type-277"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlive",
-     "field_offset" : 416,
-     "referenced_type" : "type-278"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObitsSent",
-     "field_offset" : 448,
-     "referenced_type" : "type-278"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObituaries",
-     "field_offset" : 512,
-     "referenced_type" : "type-279"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 576,
-     "referenced_type" : "type-281"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mConstantData",
-     "field_offset" : 896,
-     "referenced_type" : "type-18"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDescriptorCache",
-     "field_offset" : 960,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder",
-   "name" : "android::hardware::BpHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
-   "size" : 144,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 128,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "recipient",
-     "referenced_type" : "type-82"
-    },
-    {
-     "field_name" : "cookie",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
-   "name" : "android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "referenced_type" : "type-282"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
-   "name" : "android::hardware::BpHwBinder::ObjectManager",
-   "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "object",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "cleanupCookie",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "func",
-     "field_offset" : 128,
-     "referenced_type" : "type-287"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRemote",
-     "field_offset" : 64,
-     "referenced_type" : "type-145"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 192,
-     "referenced_type" : "type-146"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwRefBase",
-   "name" : "android::hardware::BpHwRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-448"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSeq",
-     "field_offset" : 96,
-     "referenced_type" : "type-277"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-277"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 160,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGlobalState",
-     "field_offset" : 512,
-     "referenced_type" : "type-582"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BufferedTextOutput",
-   "name" : "android::hardware::BufferedTextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 72,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
-     "referenced_type" : "type-110"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBytesPerLine",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSingleLineCutoff",
-     "field_offset" : 192,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlignment",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCArrayStyle",
-     "field_offset" : 320,
-     "referenced_type" : "type-14"
-    }
-   ],
-   "linker_set_key" : "android::hardware::HexDump",
-   "name" : "android::hardware::HexDump",
-   "record_kind" : "class",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder",
-   "name" : "android::hardware::IBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
-   "name" : "android::hardware::IBinder::DeathRecipient",
-   "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IInterface",
-   "name" : "android::hardware::IInterface",
-   "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mProcess",
-     "referenced_type" : "type-544"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingStrongDerefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-525"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingWeakDerefs",
-     "field_offset" : 384,
-     "referenced_type" : "type-526"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteStrongDerefs",
-     "field_offset" : 704,
-     "referenced_type" : "type-527"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteWeakDerefs",
-     "field_offset" : 1024,
-     "referenced_type" : "type-526"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIn",
-     "field_offset" : 1344,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOut",
-     "field_offset" : 2432,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastError",
-     "field_offset" : 3520,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingPid",
-     "field_offset" : 3552,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingSid",
-     "field_offset" : 3584,
-     "referenced_type" : "type-383"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingUid",
-     "field_offset" : 3648,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStrictModePolicy",
-     "field_offset" : 3680,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastTransactionBinderFlags",
-     "field_offset" : 3712,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContextObject",
-     "field_offset" : 3776,
-     "referenced_type" : "type-545"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsLooper",
-     "field_offset" : 3840,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsPollingThread",
-     "field_offset" : 3848,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostCommandTasks",
-     "field_offset" : 3904,
-     "referenced_type" : "type-546"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIPCThreadStateBase",
-     "field_offset" : 4096,
-     "referenced_type" : "type-547"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 4160,
-     "referenced_type" : "type-385"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IPCThreadState",
-   "name" : "android::hardware::IPCThreadState",
-   "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 528,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
-   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBufCachePos",
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufCache",
-     "field_offset" : 64,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mError",
-     "field_offset" : 256,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 320,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataSize",
-     "field_offset" : 384,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataCapacity",
-     "field_offset" : 448,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataPos",
-     "field_offset" : 512,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 576,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsSize",
-     "field_offset" : 640,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsCapacity",
-     "field_offset" : 704,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNextObjectHint",
-     "field_offset" : 768,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumRef",
-     "field_offset" : 832,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFdsKnown",
-     "field_offset" : 896,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHasFds",
-     "field_offset" : 904,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllowFds",
-     "field_offset" : 912,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 960,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnerCookie",
-     "field_offset" : 1024,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel",
-   "name" : "android::hardware::Parcel",
-   "record_kind" : "class",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6",
-   "size" : 136,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6ParcelE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "index",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "buffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-13"
-    },
-    {
-     "field_name" : "bufend",
-     "field_offset" : 128,
-     "referenced_type" : "type-13"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
-   "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDriverFD",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVMStart",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountLock",
-     "field_offset" : 192,
-     "referenced_type" : "type-376"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountDecrement",
-     "field_offset" : 512,
-     "referenced_type" : "type-377"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExecutingThreadsCount",
-     "field_offset" : 896,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMaxThreads",
-     "field_offset" : 960,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStarvationStartTimeMs",
-     "field_offset" : 1024,
-     "referenced_type" : "type-100"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 1088,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandleToObject",
-     "field_offset" : 1408,
-     "referenced_type" : "type-356"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mManagesContexts",
-     "field_offset" : 1728,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextCheckFunc",
-     "field_offset" : 1792,
-     "referenced_type" : "type-378"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextUserData",
-     "field_offset" : 1856,
-     "referenced_type" : "type-23"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContexts",
-     "field_offset" : 1920,
-     "referenced_type" : "type-363"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRootDir",
-     "field_offset" : 2240,
-     "referenced_type" : "type-382"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolStarted",
-     "field_offset" : 2304,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSpawnThreadOnStart",
-     "field_offset" : 2312,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolSeq",
-     "field_offset" : 2336,
-     "referenced_type" : "type-278"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMmapSize",
-     "field_offset" : 2368,
-     "referenced_type" : "type-187"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 2432,
-     "referenced_type" : "type-385"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState",
-   "name" : "android::hardware::ProcessState",
-   "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
-   "size" : 328,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 312,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -312,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -312,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "binder",
-     "referenced_type" : "type-53"
-    },
-    {
-     "field_name" : "refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
-   "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput",
-   "name" : "android::hardware::TextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTO",
-     "referenced_type" : "type-587"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TextOutput::Bundle",
-   "name" : "android::hardware::TextOutput::Bundle",
-   "record_kind" : "class",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCode",
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TypeCode",
-   "name" : "android::hardware::TypeCode",
-   "record_kind" : "class",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-289"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289", "type-71" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-110"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 64,
-     "referenced_type" : "type-286"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 32,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110", "type-286" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-36"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
-   "name" : "android::sp<android::hardware::BHwBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-582"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-584" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-83"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-84" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-53"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-39" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-664"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-298" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-374"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
-   "name" : "android::sp<android::hardware::ProcessState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-375" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
-   "name" : "android::trait_pointer<android::RefBase *>",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::String16>",
-   "name" : "android::trait_pointer<android::String16>",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<const void *>",
-   "name" : "android::trait_pointer<const void *>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<int>",
-   "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
-   "name" : "android::trait_trivial_copy<android::RefBase *>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
-   "name" : "android::trait_trivial_copy<android::String16>",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-120" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<const void *>",
-   "name" : "android::trait_trivial_copy<const void *>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-461" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
-   "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
-   "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase *>",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
-   "name" : "android::trait_trivial_ctor<android::String16>",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-120" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
-   "name" : "android::trait_trivial_ctor<const void *>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long long>",
-   "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-461" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
-   "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
-   "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
-   "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase *>",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
-   "name" : "android::trait_trivial_dtor<android::String16>",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-120" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
-   "name" : "android::trait_trivial_dtor<const void *>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long long>",
-   "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-461" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
-   "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
-   "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
-   "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
-   "name" : "android::trait_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String16>",
-   "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-382" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-120" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<const void *>",
-   "name" : "android::trait_trivial_move<const void *>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-461" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned int>",
-   "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long>",
-   "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase *>",
-   "name" : "android::traits<android::RefBase *>",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
-   "name" : "android::traits<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::String16>",
-   "name" : "android::traits<android::String16>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
-   "name" : "android::traits<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<const void *>",
-   "name" : "android::traits<const void *>",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android6traitsIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<int>",
-   "name" : "android::traits<int>",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android6traitsIiEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-683"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
-   "name" : "android::use_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-681"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-679"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-499"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-334"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-336"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-497"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-423"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<int>",
-   "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-83"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-84" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-53"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder>",
-   "name" : "android::wp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-39" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-102"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-102"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-224"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-236"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-230"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 16,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 64,
-     "referenced_type" : "type-228"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 128,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 192,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 256,
-     "referenced_type" : "type-9"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-102"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-102"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-102"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-102"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 320,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 384,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 80,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-173"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-174"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-169"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-164"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "lock",
-     "referenced_type" : "type-621"
-    },
-    {
-     "field_name" : "has_tls",
-     "field_offset" : 320,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tls",
-     "field_offset" : 352,
-     "referenced_type" : "type-9"
-    }
-   ],
-   "linker_set_key" : "thread_store_t",
-   "name" : "thread_store_t",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 48,
-   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
-   "unique_id" : "thread_store_t"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "referenced_type" : "type-513",
-   "self_type" : "type-534",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
-   "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/29/64/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump
index b8dfd34..12aeee8 100644
--- a/29/64/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libhidlbase.so.lsdump
@@ -11,6 +11,60 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "char [10]",
+   "name" : "char [10]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3656",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [11]",
+   "name" : "char [11]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3679",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [12]",
+   "name" : "char [12]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3653",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [13]",
+   "name" : "char [13]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3649",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [14]",
+   "name" : "char [14]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3698",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [15]",
+   "name" : "char [15]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3796",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
    "referenced_type" : "type-48",
@@ -19,6 +73,186 @@
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [17]",
+   "name" : "char [17]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3701",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [18]",
+   "name" : "char [18]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3685",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [19]",
+   "name" : "char [19]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3717",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [20]",
+   "name" : "char [20]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3695",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [22]",
+   "name" : "char [22]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3720",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [25]",
+   "name" : "char [25]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3710",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [28]",
+   "name" : "char [28]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3733",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [29]",
+   "name" : "char [29]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3707",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [2]",
+   "name" : "char [2]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3660",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [31]",
+   "name" : "char [31]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3692",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3724",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [35]",
+   "name" : "char [35]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3713",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [37]",
+   "name" : "char [37]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3704",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [3]",
+   "name" : "char [3]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3672",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4]",
+   "name" : "char [4]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3793",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [5]",
+   "name" : "char [5]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3799",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [6]",
+   "name" : "char [6]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3664",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [7]",
+   "name" : "char [7]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3688",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [8]",
+   "name" : "char [8]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3676",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [9]",
+   "name" : "char [9]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3667",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
    "referenced_type" : "type-298",
@@ -227,10 +461,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
   },
   {
@@ -1182,6 +1432,78 @@
    "name" : "_ZN7android4hidl7manager4V1_218BpHwServiceManagerC2ERKNS_2spINS_8hardware7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE"
   },
   {
@@ -1212,6 +1534,36 @@
    "name" : "_ZN7android8hardware10HidlMemoryD2Ev"
   },
   {
+   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD2Ev"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
@@ -1228,6 +1580,30 @@
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl7manager4V1_215IServiceManagerENS4_18BpHwServiceManagerENS4_18BnHwServiceManagerEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware11hidl_handle10freeHandleEv"
   },
   {
@@ -1339,18 +1715,243 @@
    "name" : "_ZN7android8hardware11hidl_stringaSERKS1_"
   },
   {
+   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_6StatusEPNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
    "name" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware14readFromParcelERKNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_"
   },
   {
@@ -1363,9 +1964,45 @@
    "name" : "_ZN7android8hardware16setRequestingSidERKNS_2spINS_4hidl4base4V1_05IBaseEEEb"
   },
   {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android8hardware17joinRpcThreadpoolEv"
   },
   {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE"
   },
   {
@@ -1384,6 +2021,9 @@
    "name" : "_ZN7android8hardware20LazyServiceRegistrarC2Ev"
   },
   {
+   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware21defaultServiceManagerEv"
   },
   {
@@ -1450,6 +2090,184 @@
    "name" : "_ZN7android8hardware31setProcessHidlReturnRestrictionENS0_21HidlReturnRestrictionE"
   },
   {
+   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel6removeEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8growDataEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9initStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware6Status11fromStatusTEi"
   },
   {
@@ -1480,6 +2298,30 @@
    "name" : "_ZN7android8hardware6StatusC2EiiPKc"
   },
   {
+   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE"
   },
   {
@@ -1659,12 +2501,75 @@
    "name" : "_ZN7android8hardware7details25registerAsServiceInternalERKNS_2spINS_4hidl4base4V1_05IBaseEEERKNSt3__112basic_stringIcNSA_11char_traitsIcEENSA_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
+  },
+  {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE"
   },
   {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE"
   },
   {
+   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv"
   },
   {
@@ -1686,12 +2591,259 @@
    "name" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv"
   },
   {
+   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4dataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
+  },
+  {
    "name" : "_ZNK7android8hardware6Status11descriptionEv"
   },
   {
+   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware7details13return_status8assertOkEv"
   },
   {
+   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNKSt3__110__back_refIcE6__execERNS_7__stateIcEE"
   },
@@ -2544,12 +3696,66 @@
    "name" : "_ZTv0_n12_N7android4hidl7manager4V1_218BnHwServiceManagerD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+  },
+  {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD0Ev"
   },
   {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
    "name" : "__aeabi_l2d"
   },
   {
@@ -2608,6 +3814,18 @@
   },
   {
    "name" : "__udivsi3"
+  },
+  {
+   "name" : "getHWBinderKernelReferences"
+  },
+  {
+   "name" : "printHexData"
+  },
+  {
+   "name" : "printTypeCode"
+  },
+  {
+   "name" : "stringForIndent"
   }
  ],
  "elf_objects" :
@@ -2659,6 +3877,21 @@
    "name" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE"
   },
   {
+   "name" : "_ZN7android8hardware12gTextBuffersE"
+  },
+  {
+   "name" : "_ZN7android8hardware13gProcessMutexE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aerrE"
+  },
+  {
+   "name" : "_ZN7android8hardware4alogE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aoutE"
+  },
+  {
    "name" : "_ZN7android8hardware7details14gServiceSidMapE"
   },
   {
@@ -2674,6 +3907,9 @@
    "name" : "_ZN7android8hardware7details6gBnMapE"
   },
   {
+   "name" : "_ZN7android8hardware8gProcessE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android4hidl4base4V1_06BsBaseE0_NS2_5IBaseE"
   },
@@ -2869,6 +4105,13 @@
    "name" : "_ZTCN7android4hidl7manager4V1_218BpHwServiceManagerE8_NS_8hardware11BpHwRefBaseE"
   },
   {
+   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE0_NS4_5IBaseE"
   },
@@ -2898,6 +4141,9 @@
    "name" : "_ZTCN7android8hardware7details6WaiterE0_NS_4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE0_NS_13basic_istreamIcS2_EE"
   },
@@ -2915,6 +4161,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
   },
   {
@@ -2972,16 +4230,31 @@
    "name" : "_ZTTN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "name" : "_ZTTN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTTN7android8hardware10IInterfaceE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
+   "name" : "_ZTTN7android8hardware12ProcessStateE"
+  },
+  {
    "name" : "_ZTTN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTTN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware7details21ClientCounterCallbackE"
   },
   {
@@ -2989,6 +4262,9 @@
    "name" : "_ZTTN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTTN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE"
   },
@@ -3001,6 +4277,14 @@
    "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
    "name" : "_ZTVN7android4hidl4base4V1_05IBaseE"
   },
   {
@@ -3079,20 +4363,85 @@
    "name" : "_ZTVN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIiEE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTVN7android8hardware10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware10PoolThreadE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10TextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android8hardware12FdTextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware12ProcessStateE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware13LogTextOutputE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android8hardware25PassthroughServiceManagerE"
   },
   {
    "name" : "_ZTVN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTVN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware7details16HidlInstrumentorE"
   },
   {
@@ -3103,6 +4452,9 @@
    "name" : "_ZTVN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTVN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__110__back_refIcEE"
   },
@@ -3188,6 +4540,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -3391,6 +4747,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-19",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -4468,6 +5850,42 @@
  [
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "referenced_type" : "type-2480",
+   "return_type" : "type-2476",
+   "self_type" : "type-2480",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-350"
+    },
+    {
+     "referenced_type" : "type-69"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2430",
+   "return_type" : "type-44",
+   "self_type" : "type-2430",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (void *)",
    "name" : "int (void *)",
    "parameters" :
@@ -4480,6 +5898,90 @@
    "return_type" : "type-19",
    "self_type" : "type-303",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2492"
+    }
+   ],
+   "referenced_type" : "type-2491",
+   "return_type" : "type-2492",
+   "self_type" : "type-2491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2353"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2352",
+   "return_type" : "type-106",
+   "self_type" : "type-2352",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (const void *, void *, void *)",
+   "name" : "void (const void *, void *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2346",
+   "return_type" : "type-106",
+   "self_type" : "type-2346",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (void *, const char *)",
+   "name" : "void (void *, const char *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "referenced_type" : "type-2541",
+   "return_type" : "type-106",
+   "self_type" : "type-2541",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "functions" :
@@ -4498,6 +6000,22 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-495"
+    },
+    {
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-3841",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::PassthroughServiceManager>::~sp",
    "linker_set_key" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev",
    "parameters" :
@@ -4511,6 +6029,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-482"
+    },
+    {
+     "referenced_type" : "type-483"
+    }
+   ],
+   "return_type" : "type-485",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-482"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-485",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2381"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-3757",
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::hidl::base::V1_0::IBase::linkToDeath",
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy",
    "parameters" :
@@ -4539,7 +6105,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2574"
+     "referenced_type" : "type-2766"
     }
    ],
    "return_type" : "type-102",
@@ -4555,7 +6121,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2575"
+     "referenced_type" : "type-2767"
     }
    ],
    "return_type" : "type-102",
@@ -4587,7 +6153,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2576"
+     "referenced_type" : "type-2768"
     }
    ],
    "return_type" : "type-102",
@@ -4603,7 +6169,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2577"
+     "referenced_type" : "type-2769"
     }
    ],
    "return_type" : "type-102",
@@ -4691,10 +6257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
-     "referenced_type" : "type-2580"
+     "referenced_type" : "type-2772"
     }
    ],
    "return_type" : "type-102",
@@ -4707,7 +6273,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
      "referenced_type" : "type-459"
@@ -4723,7 +6289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
      "referenced_type" : "type-459"
@@ -4741,13 +6307,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2775"
     }
    ],
    "return_type" : "type-19",
@@ -4766,10 +6332,10 @@
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
      "default_arg" : true,
@@ -4777,7 +6343,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2584"
+     "referenced_type" : "type-2776"
     }
    ],
    "return_type" : "type-19",
@@ -4792,13 +6358,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2585"
+     "referenced_type" : "type-2777"
     }
    ],
    "return_type" : "type-19",
@@ -4815,7 +6381,7 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2586"
+     "referenced_type" : "type-2778"
     }
    ],
    "return_type" : "type-102",
@@ -4830,13 +6396,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2587"
+     "referenced_type" : "type-2779"
     }
    ],
    "return_type" : "type-19",
@@ -4851,13 +6417,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2588"
+     "referenced_type" : "type-2780"
     }
    ],
    "return_type" : "type-19",
@@ -4872,13 +6438,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2781"
     }
    ],
    "return_type" : "type-19",
@@ -4893,13 +6459,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2782"
     }
    ],
    "return_type" : "type-19",
@@ -4914,13 +6480,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2591"
+     "referenced_type" : "type-2783"
     }
    ],
    "return_type" : "type-19",
@@ -4969,10 +6535,10 @@
      "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     }
    ],
    "return_type" : "type-106",
@@ -5007,10 +6573,10 @@
      "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     }
    ],
    "return_type" : "type-106",
@@ -5061,7 +6627,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5076,7 +6642,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5120,7 +6686,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2592"
+     "referenced_type" : "type-2784"
     }
    ],
    "return_type" : "type-102",
@@ -5136,7 +6702,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2593"
+     "referenced_type" : "type-2785"
     }
    ],
    "return_type" : "type-102",
@@ -5168,7 +6734,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2594"
+     "referenced_type" : "type-2786"
     }
    ],
    "return_type" : "type-102",
@@ -5180,13 +6746,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2787"
     }
    ],
    "return_type" : "type-102",
@@ -5198,13 +6764,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2596"
+     "referenced_type" : "type-2788"
     }
    ],
    "return_type" : "type-102",
@@ -5220,7 +6786,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2597"
+     "referenced_type" : "type-2789"
     }
    ],
    "return_type" : "type-102",
@@ -5232,13 +6798,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2790"
     }
    ],
    "return_type" : "type-102",
@@ -5276,13 +6842,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2599"
+     "referenced_type" : "type-2791"
     }
    ],
    "return_type" : "type-102",
@@ -5294,7 +6860,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5309,7 +6875,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -9924,6 +11490,416 @@
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2406"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-2335",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::sendObituary",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2360"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-949"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2415"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2792"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::HidlMemory::getInstance",
    "linker_set_key" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE",
    "parameters" :
@@ -10079,6 +12055,137 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2553"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2546"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2550"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2550"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2550"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2550"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::fromBinder",
    "linker_set_key" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE",
    "parameters" :
@@ -10131,6 +12238,133 @@
    "template_args" : [ "type-565", "type-774", "type-845" ]
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
    "access" : "private",
    "function_name" : "android::hardware::hidl_handle::freeHandle",
    "linker_set_key" : "_ZN7android8hardware11hidl_handle10freeHandleEv",
@@ -10712,6 +12946,415 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMaxThreads",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::startThreadPool",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-350"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-69"
+    },
+    {
+     "referenced_type" : "type-350"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-3809",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setCallRestriction",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-2433"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getKernelReferences",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::becomeContextManager",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-2432"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-221",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-2382",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::self",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "function_name" : "android::hardware::writeToParcel",
    "linker_set_key" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE",
    "parameters" :
@@ -10742,6 +13385,699 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2353"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
+   "return_type" : "type-3638",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::clearCaller",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::stopProcess",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setupPolling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::flushCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearLastError",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::executeCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-3644"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-472"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-447",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-447"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::self",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
+   "return_type" : "type-3638",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::process",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::shutdown",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::transact",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::sendReply",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
    "function_name" : "android::hardware::readFromParcel",
    "linker_set_key" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE",
    "parameters" :
@@ -10769,6 +14105,24 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::release_object",
+   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3622"
+    },
+    {
+     "referenced_type" : "type-3772"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::interfacesEqual",
    "linker_set_key" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_",
    "parameters" :
@@ -10811,6 +14165,143 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
+   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
+   "return_type" : "type-2508",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::print",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::addPostCommandTask",
    "linker_set_key" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE",
    "parameters" :
@@ -11200,6 +14691,934 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::Parcel::writeFloat",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-298"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-447"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-199"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::finishWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeDouble",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-4"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeObject",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3772"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-4082" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-132"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-21"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::restartWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeCString",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInplace",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::writePointer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::continueWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-343"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-350"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3769"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUnpadded",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::acquireObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::freeDataNoInit",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::releaseObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataCapacity",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeWeakBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3753"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeStrongBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2353"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2351"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
+   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::incrementNumReferences",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
+   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::write",
+   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::remove",
+   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::freeData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::growData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setError",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::initState",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBool",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-550"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::fromStatusT",
    "linker_set_key" : "_ZN7android8hardware6Status11fromStatusTEi",
    "parameters" :
@@ -11366,6 +15785,133 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2487"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2487"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-2332",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-2335",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::TaskRunner::push",
    "linker_set_key" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE",
    "parameters" :
@@ -12055,6 +16601,341 @@
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::onTransact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2793"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-2358"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-2332",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-2360"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-949"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-2363",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2794"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2476"
+    },
+    {
+     "referenced_type" : "type-3888"
+    }
+   ],
+   "return_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2476"
+    },
+    {
+     "referenced_type" : "type-3887"
+    }
+   ],
+   "return_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::operator<<",
    "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE",
    "parameters" :
@@ -12085,6 +16966,38 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::BpHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2373"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2426"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::hidl_handle::getNativeHandle",
    "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv",
    "parameters" :
@@ -12176,6 +17089,1265 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::isContextManager",
+   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3847"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isServingCall",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
+   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2511"
+    }
+   ],
+   "return_type" : "type-2471",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::clearCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::errorCheck",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::findBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3779"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3778"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-3782",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-4083" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3775"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-2350"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-21",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::scanForFds",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcDataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readCString",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-139",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::updateCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataCapacity",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::objectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-352"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3780"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-342",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcBufferSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3783"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3779"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readWeakBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-2382",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::quickFindBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::enforceInterface",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-482"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::verifyBufferObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3787"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16Inplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-343",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferChild",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferParent",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3783"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3779"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3784"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3784"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-482"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3784"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3784"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3784"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::data",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1030",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::read",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::print",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-2476"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcData",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::objects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-2353",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3779"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3773"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataAvail",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3777"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-298",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3774"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3776"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-447",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-291"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::description",
    "linker_set_key" : "_ZNK7android8hardware6Status11descriptionEv",
    "parameters" :
@@ -12189,6 +18361,22 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::IBinder::checkSubclass",
+   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2331"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::return_status::assertOk",
    "linker_set_key" : "_ZNK7android8hardware7details13return_status8assertOkEv",
    "parameters" :
@@ -12200,6 +18388,213 @@
    ],
    "return_type" : "type-106",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2362"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::getHWBinderKernelReferences",
+   "linker_set_key" : "getHWBinderKernelReferences",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printHexData",
+   "linker_set_key" : "printHexData",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-19"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2542"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printTypeCode",
+   "linker_set_key" : "printTypeCode",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2542"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::stringForIndent",
+   "linker_set_key" : "stringForIndent",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "global_vars" :
@@ -12265,6 +18660,36 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
+   "name" : "android::hardware::gTextBuffers",
+   "referenced_type" : "type-2514",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
+   "name" : "android::hardware::gProcessMutex",
+   "referenced_type" : "type-440",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aerrE",
+   "name" : "android::hardware::aerr",
+   "referenced_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4alogE",
+   "name" : "android::hardware::alog",
+   "referenced_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aoutE",
+   "name" : "android::hardware::aout",
+   "referenced_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
    "referenced_type" : "type-703",
@@ -12281,6 +18706,12 @@
    "name" : "android::hardware::details::gBnMap",
    "referenced_type" : "type-412",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware8gProcessE",
+   "name" : "android::hardware::gProcess",
+   "referenced_type" : "type-2795",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
   }
  ],
  "lvalue_reference_types" :
@@ -12305,6 +18736,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const &",
+   "name" : "android::RefBase *const &",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3634",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const &",
+   "name" : "android::RefBase::weakref_type *const &",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3630",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
    "referenced_type" : "type-342",
@@ -12323,6 +18772,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const &",
+   "name" : "android::hardware::BHwBinder *const &",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "referenced_type" : "type-29",
@@ -12359,6 +18817,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump &",
+   "name" : "android::hardware::HexDump &",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
    "referenced_type" : "type-1376",
@@ -12370,8 +18837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12386,6 +18853,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel &",
+   "name" : "android::hardware::Parcel &",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
+   "name" : "android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-3833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "referenced_type" : "type-807",
@@ -12476,6 +18961,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2428",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2476",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3483",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3843",
+   "self_type" : "type-3842",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "referenced_type" : "type-1009",
@@ -12620,6 +19159,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3807",
+   "self_type" : "type-3819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
+   "name" : "android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-472",
+   "self_type" : "type-3635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
    "referenced_type" : "type-71",
@@ -12629,6 +19204,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
+   "name" : "android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-491",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
    "referenced_type" : "type-789",
@@ -12710,6 +19294,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-944",
+   "self_type" : "type-2404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
+   "name" : "android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-3757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "referenced_type" : "type-32",
@@ -12719,6 +19321,258 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "char *const &",
+   "name" : "char *const &",
+   "referenced_type" : "type-3790",
+   "self_type" : "type-3791",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[10]",
+   "name" : "char const (&)[10]",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[11]",
+   "name" : "char const (&)[11]",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3680",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[12]",
+   "name" : "char const (&)[12]",
+   "referenced_type" : "type-3652",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[13]",
+   "name" : "char const (&)[13]",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3651",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[14]",
+   "name" : "char const (&)[14]",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[15]",
+   "name" : "char const (&)[15]",
+   "referenced_type" : "type-3795",
+   "self_type" : "type-3797",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[16]",
+   "name" : "char const (&)[16]",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3682",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[17]",
+   "name" : "char const (&)[17]",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3702",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[18]",
+   "name" : "char const (&)[18]",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3686",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[19]",
+   "name" : "char const (&)[19]",
+   "referenced_type" : "type-3716",
+   "self_type" : "type-3718",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[20]",
+   "name" : "char const (&)[20]",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3696",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[22]",
+   "name" : "char const (&)[22]",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3722",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[25]",
+   "name" : "char const (&)[25]",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3711",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[28]",
+   "name" : "char const (&)[28]",
+   "referenced_type" : "type-3732",
+   "self_type" : "type-3734",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[29]",
+   "name" : "char const (&)[29]",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3708",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[2]",
+   "name" : "char const (&)[2]",
+   "referenced_type" : "type-3659",
+   "self_type" : "type-3661",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[31]",
+   "name" : "char const (&)[31]",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3693",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[32]",
+   "name" : "char const (&)[32]",
+   "referenced_type" : "type-3723",
+   "self_type" : "type-3725",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[35]",
+   "name" : "char const (&)[35]",
+   "referenced_type" : "type-3712",
+   "self_type" : "type-3714",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[37]",
+   "name" : "char const (&)[37]",
+   "referenced_type" : "type-3703",
+   "self_type" : "type-3705",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[3]",
+   "name" : "char const (&)[3]",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3674",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[4]",
+   "name" : "char const (&)[4]",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3794",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[5]",
+   "name" : "char const (&)[5]",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[6]",
+   "name" : "char const (&)[6]",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3665",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[7]",
+   "name" : "char const (&)[7]",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[8]",
+   "name" : "char const (&)[8]",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3677",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[9]",
+   "name" : "char const (&)[9]",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3668",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-348",
@@ -12737,6 +19591,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
+   "name" : "const android::hardware::BpHwBinder::Obituary &",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2415",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump &",
+   "name" : "const android::hardware::HexDump &",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-3888",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
    "referenced_type" : "type-1038",
@@ -12793,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1966",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12802,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2078",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2050",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12811,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12820,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -12829,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12838,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -12847,8 +19728,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2355",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2571",
+   "self_type" : "type-2573",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12856,6 +19746,60 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3103",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3186",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3252",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3308",
+   "self_type" : "type-3310",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3353",
+   "self_type" : "type-3355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3409",
+   "self_type" : "type-3411",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
    "referenced_type" : "type-368",
    "self_type" : "type-370",
    "size" : 4,
@@ -12863,6 +19807,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3915",
+   "self_type" : "type-3917",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
+   "name" : "const android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
    "referenced_type" : "type-506",
@@ -12890,6 +19852,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode &",
+   "name" : "const android::hardware::TypeCode &",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-3887",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
    "referenced_type" : "type-1050",
@@ -12946,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13016,6 +19987,105 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
+   "name" : "const android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2498",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2358",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3469",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2526",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2540",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3587",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3594",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
    "referenced_type" : "type-70",
@@ -13025,6 +20095,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
+   "name" : "const android::sp<android::hardware::IInterface> &",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "referenced_type" : "type-765",
@@ -13034,6 +20113,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
+   "name" : "const android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-496",
+   "self_type" : "type-3622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "referenced_type" : "type-950",
@@ -13115,6 +20203,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2360",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
    "referenced_type" : "type-1367",
@@ -13126,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2570",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13142,6 +20239,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3752",
+   "self_type" : "type-3753",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3914",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "referenced_type" : "type-464",
@@ -13169,6 +20284,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const char &",
+   "name" : "const char &",
+   "referenced_type" : "type-100",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *const &",
+   "name" : "const char *const &",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-3",
@@ -13178,6 +20311,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object &",
+   "name" : "const flat_binder_object &",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
    "referenced_type" : "type-665",
@@ -13267,113 +20409,162 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1695",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1735",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1799",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1832",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1976",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1941",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2053",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2026",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2216",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2262",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2313",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2554",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2658",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2496",
-   "self_type" : "type-2498",
+   "referenced_type" : "type-2726",
+   "self_type" : "type-2728",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2571",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2839",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2877",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2933",
+   "self_type" : "type-2936",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2944",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3012",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3084",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3163",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3228",
+   "self_type" : "type-3230",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13386,6 +20577,62 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3285",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3335",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3346",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3390",
+   "self_type" : "type-3392",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3434",
+   "self_type" : "type-3436",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3896",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4004",
+   "self_type" : "type-4006",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4079",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
    "referenced_type" : "type-515",
    "self_type" : "type-517",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -13569,17 +20816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1708",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13587,8 +20825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -13596,8 +20834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13605,8 +20843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2070",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13614,6 +20852,15 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2037",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "type-206",
    "self_type" : "type-214",
    "size" : 4,
@@ -13623,8 +20870,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2096",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13632,17 +20879,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2086",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2129",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13650,8 +20888,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13659,26 +20897,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2199",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2252",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -13686,8 +20906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2601",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13695,8 +20915,143 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2510",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2668",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2744",
+   "self_type" : "type-2746",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2816",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2882",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2963",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3111",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3151",
+   "self_type" : "type-3185",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3172",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3189",
+   "self_type" : "type-3194",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3239",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3294",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3301",
+   "self_type" : "type-3307",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3408",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3942",
+   "self_type" : "type-3944",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-4016",
+   "self_type" : "type-4018",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13758,8 +21113,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2738",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13785,8 +21149,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2594",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
+   "name" : "const std::function<sp<IBinder> (void *)> &",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13812,8 +21185,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2310",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13828,10 +21201,46 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3644",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3765",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1806",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2951",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13947,8 +21356,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13956,8 +21365,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1740",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13965,8 +21374,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1849",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13974,8 +21383,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13983,8 +21392,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13992,8 +21401,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14001,8 +21410,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14010,8 +21419,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14028,17 +21437,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2148",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14055,6 +21455,15 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "referenced_type" : "type-219",
    "self_type" : "type-218",
    "size" : 4,
@@ -14064,8 +21473,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14073,8 +21482,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14082,8 +21491,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14091,8 +21500,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14100,8 +21509,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2690",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14109,8 +21518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14118,8 +21527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14127,8 +21536,143 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2993",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3005",
+   "self_type" : "type-3004",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3026",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3198",
+   "self_type" : "type-3197",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3314",
+   "self_type" : "type-3313",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3368",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3405",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3426",
+   "self_type" : "type-3425",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3440",
+   "self_type" : "type-3439",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14145,6 +21689,24 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3928",
+   "self_type" : "type-3927",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4041",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "referenced_type" : "type-568",
    "self_type" : "type-567",
    "size" : 4,
@@ -14233,6 +21795,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned char *const &",
+   "name" : "const unsigned char *const &",
+   "referenced_type" : "type-3727",
+   "self_type" : "type-3728",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
    "referenced_type" : "type-246",
@@ -14242,6 +21813,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *const &",
+   "name" : "const unsigned int *const &",
+   "referenced_type" : "type-3729",
+   "self_type" : "type-3731",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
    "referenced_type" : "type-661",
@@ -14260,6 +21840,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void *const &",
+   "name" : "const void *const &",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-19",
@@ -14289,8 +21878,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14298,17 +21887,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2210",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14316,6 +21896,15 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2492",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 4,
@@ -14325,6 +21914,78 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3318",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3803",
+   "self_type" : "type-3802",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3879",
+   "self_type" : "type-3878",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
    "referenced_type" : "type-822",
    "self_type" : "type-821",
    "size" : 4,
@@ -14338,6 +21999,15 @@
    "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *const &",
+   "name" : "void *const &",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3670",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   }
  ],
  "pointer_types" :
@@ -14371,6 +22041,78 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2437",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3636",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3788",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3883",
+   "self_type" : "type-3882",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-433",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
    "referenced_type" : "type-436",
@@ -14425,6 +22167,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase **",
+   "name" : "android::RefBase **",
+   "referenced_type" : "type-68",
+   "self_type" : "type-3606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const *",
+   "name" : "android::RefBase *const *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3612",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-1100",
@@ -14490,8 +22250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14499,8 +22259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14508,8 +22268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1763",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1728",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14517,8 +22277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14526,8 +22286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14535,8 +22295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14544,8 +22304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2051",
-   "self_type" : "type-2050",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14553,8 +22313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14562,8 +22322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14571,8 +22331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14580,8 +22340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14589,8 +22349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14598,8 +22358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14607,8 +22367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14616,8 +22376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14625,8 +22385,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14643,6 +22439,69 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2872",
+   "self_type" : "type-2871",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2938",
+   "self_type" : "type-2937",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3079",
+   "self_type" : "type-3078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3159",
+   "self_type" : "type-3158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-321",
    "self_type" : "type-320",
    "size" : 4,
@@ -14652,6 +22511,168 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3388",
+   "self_type" : "type-3387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3432",
+   "self_type" : "type-3431",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3619",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4002",
+   "self_type" : "type-4001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4074",
+   "self_type" : "type-4073",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-511",
    "self_type" : "type-510",
    "size" : 4,
@@ -14749,6 +22770,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type **",
+   "name" : "android::RefBase::weakref_type **",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3605",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const *",
+   "name" : "android::RefBase::weakref_type *const *",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
    "referenced_type" : "type-9",
@@ -14767,6 +22806,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
    "referenced_type" : "type-342",
@@ -14794,6 +22851,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase *> *",
+   "name" : "android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-432",
+   "self_type" : "type-3631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-431",
+   "self_type" : "type-3627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Vector<android::String8> *",
    "name" : "android::Vector<android::String8> *",
    "referenced_type" : "type-252",
@@ -14803,6 +22878,96 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-3623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2338",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3840",
+   "self_type" : "type-3839",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-428",
+   "self_type" : "type-3829",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
    "referenced_type" : "type-182",
@@ -14859,8 +23024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14868,8 +23033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14877,8 +23042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14886,8 +23051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14895,8 +23060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14904,8 +23069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14913,8 +23078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14922,8 +23087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14931,8 +23096,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2904",
+   "self_type" : "type-2903",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3030",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3203",
+   "self_type" : "type-3202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3323",
+   "self_type" : "type-3322",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3379",
+   "self_type" : "type-3378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14949,6 +23195,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3926",
+   "self_type" : "type-3925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
    "referenced_type" : "type-782",
    "self_type" : "type-781",
    "size" : 4,
@@ -14974,6 +23229,132 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder **",
+   "name" : "android::hardware::BHwBinder **",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const *",
+   "name" : "android::hardware::BHwBinder *const *",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3608",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder *",
+   "name" : "android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2335",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
+   "name" : "android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2424",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwRefBase *",
+   "name" : "android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2369",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput *",
+   "name" : "android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2507",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3545",
+   "self_type" : "type-3544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3881",
+   "self_type" : "type-3880",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2508",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "referenced_type" : "type-29",
@@ -15028,6 +23409,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump *",
+   "name" : "android::hardware::HexDump *",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2487",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::HidlMemory *",
    "name" : "android::hardware::HidlMemory *",
    "referenced_type" : "type-159",
@@ -15102,8 +23492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15111,8 +23501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15120,8 +23510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15129,8 +23519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1924",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15138,8 +23528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15147,8 +23537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15156,8 +23546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15165,8 +23555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15174,8 +23564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15183,8 +23573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15192,8 +23582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15201,8 +23591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15210,8 +23600,134 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2696",
+   "self_type" : "type-2695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2759",
+   "self_type" : "type-2758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2997",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3033",
+   "self_type" : "type-3032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3146",
+   "self_type" : "type-3145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3263",
+   "self_type" : "type-3262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3443",
+   "self_type" : "type-3442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15327,8 +23843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15336,8 +23852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15345,8 +23861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15354,8 +23870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15363,8 +23879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15372,8 +23888,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3196",
+   "self_type" : "type-3195",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3317",
+   "self_type" : "type-3316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3321",
+   "self_type" : "type-3320",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3429",
+   "self_type" : "type-3428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15426,8 +24005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15435,8 +24014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2040",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15444,8 +24023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2067",
+   "self_type" : "type-2066",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15453,8 +24032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15462,8 +24041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15471,8 +24050,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3053",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3148",
+   "self_type" : "type-3147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3330",
+   "self_type" : "type-3329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3384",
+   "self_type" : "type-3383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15487,6 +24129,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::IPCThreadState *",
+   "name" : "android::hardware::IPCThreadState *",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
    "referenced_type" : "type-530",
@@ -15552,8 +24203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15561,8 +24212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15570,8 +24221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15579,8 +24230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15588,8 +24239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15597,8 +24248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15606,8 +24257,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2574",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15615,6 +24275,60 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3109",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3312",
+   "self_type" : "type-3311",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3357",
+   "self_type" : "type-3356",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3413",
+   "self_type" : "type-3412",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
    "referenced_type" : "type-372",
    "self_type" : "type-371",
    "size" : 4,
@@ -15622,10 +24336,28 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PassthroughServiceManager *",
+   "name" : "android::hardware::PassthroughServiceManager *",
+   "referenced_type" : "type-2897",
+   "self_type" : "type-2896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15640,6 +24372,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::PoolThread *",
+   "name" : "android::hardware::PoolThread *",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
    "referenced_type" : "type-1091",
@@ -15687,8 +24428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15696,8 +24437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15705,8 +24446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2041",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15714,8 +24455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15723,8 +24464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2159",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15732,8 +24473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15741,8 +24482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15750,8 +24491,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3000",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3056",
+   "self_type" : "type-3055",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3150",
+   "self_type" : "type-3149",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15784,6 +24606,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
+   "name" : "android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-3809",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "referenced_type" : "type-807",
@@ -15874,6 +24705,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2481",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput *",
+   "name" : "android::hardware::TextOutput *",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-3886",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
+   "name" : "android::hardware::TextOutput::Bundle *",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TypeCode *",
+   "name" : "android::hardware::TypeCode *",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
    "referenced_type" : "type-1514",
@@ -15885,8 +24752,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2558",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2712",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
+   "name" : "android::hardware::details::ClientCounterCallback *",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15966,8 +24842,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-2908",
+   "self_type" : "type-2907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16173,8 +25058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16378,6 +25263,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3807",
+   "self_type" : "type-3811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Thread> *",
+   "name" : "android::sp<android::Thread> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-3823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
    "referenced_type" : "type-472",
@@ -16387,6 +25299,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> *",
    "name" : "android::sp<android::hardware::HidlMemory> *",
    "referenced_type" : "type-157",
@@ -16540,6 +25461,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
+   "name" : "android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-361",
@@ -16567,6 +25497,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2432",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-3779",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-48",
@@ -16585,6 +25533,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
    "referenced_type" : "type-333",
@@ -16603,6 +25569,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-3827",
+   "self_type" : "type-3828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
    "referenced_type" : "type-348",
@@ -16621,6 +25605,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase *> *",
+   "name" : "const android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3633",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
    "referenced_type" : "type-254",
@@ -16630,6 +25632,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
    "referenced_type" : "type-249",
@@ -16639,6 +25686,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BHwBinder *",
+   "name" : "const android::hardware::BHwBinder *",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2362",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder *",
+   "name" : "const android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2373",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
+   "name" : "const android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2426",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2371",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
+   "name" : "const android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "referenced_type" : "type-1051",
@@ -16684,6 +25785,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump *",
+   "name" : "const android::hardware::HexDump *",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2490",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
    "referenced_type" : "type-1443",
@@ -16695,8 +25805,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-2477",
-   "self_type" : "type-2479",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2331",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16711,6 +25839,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
+   "name" : "const android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2421",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IInterface *",
+   "name" : "const android::hardware::IInterface *",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2553",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IPCThreadState *",
+   "name" : "const android::hardware::IPCThreadState *",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3641",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel *",
+   "name" : "const android::hardware::Parcel *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-3766",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState *",
+   "name" : "const android::hardware::ProcessState *",
+   "referenced_type" : "type-3846",
+   "self_type" : "type-3847",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
+   "name" : "const android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "referenced_type" : "type-811",
@@ -16792,10 +25974,28 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode *",
+   "name" : "const android::hardware::TypeCode *",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16875,8 +26075,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16920,8 +26120,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17089,6 +26289,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::Thread> *",
+   "name" : "const android::sp<android::Thread> *",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
+   "name" : "const android::sp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3650",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2498",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory> *",
    "name" : "const android::sp<android::hardware::HidlMemory> *",
    "referenced_type" : "type-162",
@@ -17098,6 +26343,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2423",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
    "referenced_type" : "type-70",
@@ -17107,6 +26361,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
+   "name" : "const android::sp<android::hardware::IInterface> *",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
    "referenced_type" : "type-496",
@@ -17215,6 +26478,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
+   "name" : "const android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-3752",
+   "self_type" : "type-3759",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-464",
@@ -17233,6 +26514,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const binder_buffer_object *",
+   "name" : "const binder_buffer_object *",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3787",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
    "referenced_type" : "type-100",
@@ -17262,17 +26552,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2111",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const dirent *",
-   "name" : "const dirent *",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17287,6 +26568,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-3210",
+   "self_type" : "type-3219",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object *",
+   "name" : "const flat_binder_object *",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
    "referenced_type" : "type-624",
@@ -17314,6 +26622,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const native_handle **",
+   "name" : "const native_handle **",
+   "referenced_type" : "type-16",
+   "self_type" : "type-3784",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
    "referenced_type" : "type-604",
@@ -17323,6 +26640,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *",
+   "name" : "const unsigned int *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-3730",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const unsigned long long *",
+   "name" : "const unsigned long long *",
+   "referenced_type" : "type-661",
+   "self_type" : "type-2353",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
    "referenced_type" : "type-138",
@@ -17332,6 +26667,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void **",
+   "name" : "const void **",
+   "referenced_type" : "type-139",
+   "self_type" : "type-3783",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "double *",
+   "name" : "double *",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3778",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "float *",
+   "name" : "float *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-3777",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
    "referenced_type" : "type-303",
@@ -17359,6 +26721,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long *",
+   "name" : "long long *",
+   "referenced_type" : "type-447",
+   "self_type" : "type-3776",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-18",
@@ -17368,6 +26739,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "short *",
+   "name" : "short *",
+   "referenced_type" : "type-2",
+   "self_type" : "type-3774",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-3773",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2494",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "referenced_type" : "type-1251",
@@ -17379,17 +26786,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2096",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17404,6 +26802,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-3282",
+   "self_type" : "type-3281",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-199",
@@ -17422,6 +26838,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "unsigned long long *",
+   "name" : "unsigned long long *",
+   "referenced_type" : "type-21",
+   "self_type" : "type-2350",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short *",
+   "name" : "unsigned short *",
+   "referenced_type" : "type-132",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(const void *, void *, void *)",
+   "name" : "void (*)(const void *, void *, void *)",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const char *)",
+   "name" : "void (*)(void *, const char *)",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2542",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
    "referenced_type" : "type-106",
@@ -17444,6 +26905,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase *const",
+   "name" : "android::RefBase *const",
+   "referenced_type" : "type-68",
+   "self_type" : "type-3611",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-1099",
@@ -17516,8 +26987,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17526,8 +26997,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17536,8 +27007,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1730",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17546,8 +27017,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17556,8 +27027,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17566,8 +27037,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17576,8 +27047,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2052",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17586,8 +27057,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17596,8 +27067,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17606,8 +27077,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17616,8 +27087,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17626,8 +27097,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17636,8 +27107,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17646,8 +27117,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17656,8 +27127,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2500",
+   "self_type" : "type-2502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17666,8 +27137,48 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2723",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17686,6 +27197,76 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2939",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-320",
    "self_type" : "type-322",
    "size" : 4,
@@ -17696,6 +27277,186 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3278",
+   "self_type" : "type-3280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3343",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3387",
+   "self_type" : "type-3389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3433",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3446",
+   "self_type" : "type-3448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3569",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3619",
+   "self_type" : "type-3621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3754",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3877",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4001",
+   "self_type" : "type-4003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-510",
    "self_type" : "type-513",
    "size" : 4,
@@ -17794,6 +27555,316 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_type *const",
+   "name" : "android::RefBase::weakref_type *const",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::BHwBinder *const",
+   "name" : "android::hardware::BHwBinder *const",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-3607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2366",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "char *const",
+   "name" : "char *const",
+   "referenced_type" : "type-243",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[10]",
+   "name" : "char const[10]",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[11]",
+   "name" : "char const[11]",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3678",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[12]",
+   "name" : "char const[12]",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[13]",
+   "name" : "char const[13]",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3648",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[14]",
+   "name" : "char const[14]",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[15]",
+   "name" : "char const[15]",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[16]",
+   "name" : "char const[16]",
+   "referenced_type" : "type-47",
+   "self_type" : "type-3681",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[17]",
+   "name" : "char const[17]",
+   "referenced_type" : "type-3701",
+   "self_type" : "type-3700",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[18]",
+   "name" : "char const[18]",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[19]",
+   "name" : "char const[19]",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3716",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[20]",
+   "name" : "char const[20]",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[22]",
+   "name" : "char const[22]",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[25]",
+   "name" : "char const[25]",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3709",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[28]",
+   "name" : "char const[28]",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[29]",
+   "name" : "char const[29]",
+   "referenced_type" : "type-3707",
+   "self_type" : "type-3706",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[2]",
+   "name" : "char const[2]",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[31]",
+   "name" : "char const[31]",
+   "referenced_type" : "type-3692",
+   "self_type" : "type-3691",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[32]",
+   "name" : "char const[32]",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[35]",
+   "name" : "char const[35]",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[37]",
+   "name" : "char const[37]",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[3]",
+   "name" : "char const[3]",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3671",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[4]",
+   "name" : "char const[4]",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[5]",
+   "name" : "char const[5]",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[6]",
+   "name" : "char const[6]",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[7]",
+   "name" : "char const[7]",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3687",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[8]",
+   "name" : "char const[8]",
+   "referenced_type" : "type-3676",
+   "self_type" : "type-3675",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[9]",
+   "name" : "char const[9]",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::CallStack",
    "name" : "const android::CallStack",
    "referenced_type" : "type-256",
@@ -17804,6 +27875,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-433",
+   "self_type" : "type-3836",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2418",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
    "referenced_type" : "type-315",
@@ -17824,6 +27915,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3827",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2408",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
    "referenced_type" : "type-342",
@@ -17844,6 +27955,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase *>",
+   "name" : "const android::Vector<android::RefBase *>",
+   "referenced_type" : "type-432",
+   "self_type" : "type-3632",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
+   "name" : "const android::Vector<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-431",
+   "self_type" : "type-3628",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
    "referenced_type" : "type-252",
@@ -17854,6 +27985,56 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
+   "name" : "const android::Vector<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-430",
+   "self_type" : "type-3624",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2413",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-428",
+   "self_type" : "type-3831",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2520",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<int>",
+   "name" : "const android::Vector<int>",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-244",
@@ -17864,6 +28045,76 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BHwBinder",
+   "name" : "const android::hardware::BHwBinder",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2361",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder",
+   "name" : "const android::hardware::BpHwBinder",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2372",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
+   "name" : "const android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2391",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2425",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2398",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2370",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput",
+   "name" : "const android::hardware::BufferedTextOutput",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2510",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "referenced_type" : "type-29",
@@ -17914,6 +28165,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::HexDump",
+   "name" : "const android::hardware::HexDump",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2489",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
    "referenced_type" : "type-1444",
@@ -17926,8 +28187,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-2478",
-   "self_type" : "type-2477",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2330",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17944,6 +28225,36 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
+   "name" : "const android::hardware::IBinder::DeathRecipient",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2420",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IInterface",
+   "name" : "const android::hardware::IInterface",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2552",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IPCThreadState",
+   "name" : "const android::hardware::IPCThreadState",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-3639",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
    "referenced_type" : "type-1039",
@@ -18006,8 +28317,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1964",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18016,8 +28327,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -18026,8 +28337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -18036,8 +28347,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -18046,8 +28357,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18056,8 +28367,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -18066,8 +28377,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2354",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2571",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18076,6 +28397,66 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3103",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3308",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3354",
+   "self_type" : "type-3353",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3410",
+   "self_type" : "type-3409",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
    "referenced_type" : "type-369",
    "self_type" : "type-368",
    "size" : 68,
@@ -18084,6 +28465,36 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3916",
+   "self_type" : "type-3915",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState",
+   "name" : "const android::hardware::ProcessState",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-3846",
+   "size" : 128,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
+   "name" : "const android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-3812",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "referenced_type" : "type-807",
@@ -18184,6 +28595,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::TypeCode",
+   "name" : "const android::hardware::TypeCode",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2484",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
    "referenced_type" : "type-37",
@@ -18196,8 +28617,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1771",
+   "size" : 52,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::Waiter",
+   "name" : "const android::hardware::details::Waiter",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2917",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18287,7 +28718,7 @@
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32>",
    "name" : "const android::hardware::hidl_array<unsigned char, 32>",
    "referenced_type" : "type-1012",
-   "self_type" : "type-2292",
+   "self_type" : "type-2268",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18337,7 +28768,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "referenced_type" : "type-1008",
-   "self_type" : "type-2293",
+   "self_type" : "type-2270",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18564,6 +28995,56 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3807",
+   "self_type" : "type-3806",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::Thread>",
+   "name" : "const android::sp<android::Thread>",
+   "referenced_type" : "type-499",
+   "self_type" : "type-3830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
+   "name" : "const android::sp<android::hardware::BHwBinder>",
+   "referenced_type" : "type-472",
+   "self_type" : "type-3640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
    "name" : "const android::sp<android::hardware::HidlMemory>",
    "referenced_type" : "type-157",
@@ -18572,6 +29053,64 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2356",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-962",
+   "self_type" : "type-2405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2524",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3592",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
@@ -18584,6 +29123,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
+   "name" : "const android::sp<android::hardware::IInterface>",
+   "referenced_type" : "type-968",
+   "self_type" : "type-2547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "referenced_type" : "type-766",
@@ -18712,6 +29261,16 @@
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-944",
+   "self_type" : "type-2359",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
@@ -18720,11 +29279,21 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-3752",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -18736,6 +29305,14 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3912",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient>",
@@ -18756,6 +29333,16 @@
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const binder_buffer_object",
+   "name" : "const binder_buffer_object",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3785",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
@@ -18776,6 +29363,16 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const char *const",
+   "name" : "const char *const",
+   "referenced_type" : "type-99",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
@@ -18800,18 +29397,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
-   "size" : 280,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const dirent",
-   "name" : "const dirent",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18828,6 +29415,26 @@
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
+   "size" : 280,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-3326",
+   "self_type" : "type-3325",
+   "size" : 280,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-4",
@@ -18836,6 +29443,16 @@
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const flat_binder_object",
+   "name" : "const flat_binder_object",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const float",
@@ -18939,128 +29556,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1732",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2024",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2175",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2214",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2548",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2656",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2497",
-   "self_type" : "type-2496",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2572",
-   "self_type" : "type-2571",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2875",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2942",
+   "self_type" : "type-2941",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3011",
+   "self_type" : "type-3010",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3083",
+   "self_type" : "type-3082",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3284",
+   "self_type" : "type-3283",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19075,6 +29756,62 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
+   "referenced_type" : "type-3334",
+   "self_type" : "type-3333",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3345",
+   "self_type" : "type-3344",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3391",
+   "self_type" : "type-3390",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4004",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
    "referenced_type" : "type-516",
    "self_type" : "type-515",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -19270,8 +30007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1698",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19280,8 +30017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1737",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19290,8 +30027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19300,8 +30037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19310,8 +30047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19320,8 +30057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19330,8 +30067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19340,8 +30077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2148",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19350,8 +30087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19360,8 +30097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19370,28 +30107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2295",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2332",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19410,8 +30127,138 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2505",
-   "self_type" : "type-2504",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2559",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2842",
+   "self_type" : "type-2841",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2881",
+   "self_type" : "type-2880",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2958",
+   "self_type" : "type-2957",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3101",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3236",
+   "self_type" : "type-3235",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3352",
+   "self_type" : "type-3351",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3401",
+   "self_type" : "type-3400",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19430,6 +30277,36 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3438",
+   "self_type" : "type-3437",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3902",
+   "self_type" : "type-3901",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4012",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "referenced_type" : "type-528",
    "self_type" : "type-527",
    "size" : 12,
@@ -19560,8 +30437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1750",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19570,8 +30447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19580,8 +30457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19590,8 +30467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19600,8 +30477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19610,8 +30487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2141",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19620,8 +30497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19630,8 +30507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19640,8 +30517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19650,8 +30527,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2527",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-2972",
+   "self_type" : "type-2971",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3025",
+   "self_type" : "type-3024",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3305",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-4035",
+   "self_type" : "type-4034",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19770,8 +30747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1711",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19780,8 +30757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19790,8 +30767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19800,8 +30777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2019",
-   "self_type" : "type-2018",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19810,8 +30787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19820,8 +30797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19830,8 +30807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19840,8 +30817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19850,8 +30827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19860,8 +30837,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2970",
+   "self_type" : "type-2969",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3022",
+   "self_type" : "type-3021",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3126",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3304",
+   "self_type" : "type-3303",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3421",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-4033",
+   "self_type" : "type-4032",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -20020,18 +31097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1706",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20040,8 +31107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -20050,8 +31117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20060,8 +31127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20070,8 +31137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20090,18 +31157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20110,8 +31167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20120,18 +31177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2229",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20140,8 +31187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -20150,8 +31197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2599",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20160,8 +31207,158 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2508",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2666",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2744",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2814",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2879",
+   "self_type" : "type-2878",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3111",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3238",
+   "self_type" : "type-3237",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3301",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3359",
+   "self_type" : "type-3358",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -20230,8 +31427,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2809",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20260,8 +31467,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2595",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
+   "name" : "const std::function<sp<IBinder> (void *)>",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20300,8 +31517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -20310,8 +31527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2578",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -20330,12 +31547,42 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3762",
+   "self_type" : "type-3761",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
    "referenced_type" : "type-377",
    "self_type" : "type-376",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
@@ -20390,8 +31637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20400,8 +31647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2029",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20410,8 +31657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2125",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20420,8 +31667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2146",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20430,8 +31677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20440,8 +31687,68 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3092",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3234",
+   "self_type" : "type-3233",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3396",
+   "self_type" : "type-3395",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20500,8 +31807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20510,8 +31817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2057",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2027",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20520,8 +31827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20530,8 +31837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20540,8 +31847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20550,18 +31857,98 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3087",
+   "self_type" : "type-3086",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3232",
+   "self_type" : "type-3231",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3286",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3394",
+   "self_type" : "type-3393",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> >",
+   "name" : "const std::vector<int, std::allocator<int> >",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20690,8 +32077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20700,8 +32087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1741",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20710,8 +32097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20720,8 +32107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20730,8 +32117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20740,8 +32127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20750,8 +32137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20760,8 +32147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20780,18 +32167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20810,8 +32187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20830,8 +32207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2243",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20840,8 +32217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20850,8 +32227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20860,8 +32237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20870,8 +32247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2691",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20880,8 +32257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2755",
+   "self_type" : "type-2754",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20890,8 +32267,168 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-2826",
+   "self_type" : "type-2825",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2861",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2885",
+   "self_type" : "type-2884",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2995",
+   "self_type" : "type-2994",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3005",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3027",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3141",
+   "self_type" : "type-3140",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3199",
+   "self_type" : "type-3198",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3218",
+   "self_type" : "type-3217",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3315",
+   "self_type" : "type-3314",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3427",
+   "self_type" : "type-3426",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3440",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20910,6 +32447,26 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4043",
+   "self_type" : "type-4042",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "referenced_type" : "type-569",
    "self_type" : "type-568",
    "size" : 12,
@@ -21008,6 +32565,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned char *const",
+   "name" : "const unsigned char *const",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-3727",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-1",
@@ -21016,6 +32583,16 @@
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int *const",
+   "name" : "const unsigned int *const",
+   "referenced_type" : "type-3730",
+   "self_type" : "type-3729",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
@@ -21044,6 +32621,26 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const void *const",
+   "name" : "const void *const",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2386",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "void *const",
+   "name" : "void *const",
+   "referenced_type" : "type-245",
+   "self_type" : "type-3669",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 1,
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
@@ -21052,12 +32649,75 @@
    "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-19",
+   "self_type" : "type-2337",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
   }
  ],
  "record_types" :
  [
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-9"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-2504"
+    },
+    {
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-2505"
+    }
+   ],
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-2503",
+   "self_type" : "type-2503",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -21086,6 +32746,16 @@
    "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::CompileTimeAssert<true>",
+   "name" : "android::CompileTimeAssert<true>",
+   "referenced_type" : "type-3804",
+   "self_type" : "type-3804",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Debug.h",
+   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -21130,6 +32800,26 @@
    [
     {
      "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2342"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "field_name" : "mCount",
      "referenced_type" : "type-314"
     }
@@ -21470,6 +33160,64 @@
    "base_specifiers" :
    [
     {
+     "access" : "private",
+     "referenced_type" : "type-251"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2343" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "type-244"
     }
    ],
@@ -21949,6 +33697,61 @@
      "referenced_type" : "type-244"
     }
    ],
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
@@ -21997,6 +33800,116 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2518",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
+   "linker_set_key" : "android::Vector<int>",
+   "name" : "android::Vector<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2514",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android6VectorIiEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -22111,6 +34024,617 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3871",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342", "type-71" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2468",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-2334"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 64,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlive",
+     "field_offset" : 96,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObitsSent",
+     "field_offset" : 128,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObituaries",
+     "field_offset" : 160,
+     "referenced_type" : "type-2338"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 192,
+     "referenced_type" : "type-2340"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mConstantData",
+     "field_offset" : 352,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDescriptorCache",
+     "field_offset" : 384,
+     "referenced_type" : "type-342"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder",
+   "name" : "android::hardware::BpHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 52,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "recipient",
+     "referenced_type" : "type-944"
+    },
+    {
+     "field_name" : "cookie",
+     "field_offset" : 64,
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 96,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
+   "name" : "android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2374",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "referenced_type" : "type-2341"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
+   "name" : "android::hardware::BpHwBinder::ObjectManager",
+   "record_kind" : "class",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "object",
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "cleanupCookie",
+     "field_offset" : 32,
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "func",
+     "field_offset" : 64,
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2344",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-2366"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-35"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-2368"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2365",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2474"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mFlags",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSeq",
+     "field_offset" : 64,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIndex",
+     "field_offset" : 96,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mGlobalState",
+     "field_offset" : 160,
+     "referenced_type" : "type-2471"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BufferedTextOutput",
+   "name" : "android::hardware::BufferedTextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2506",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
+    }
+   ]
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -22273,6 +34797,55 @@
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-139"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBytesPerLine",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSingleLineCutoff",
+     "field_offset" : 96,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlignment",
+     "field_offset" : 128,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCArrayStyle",
+     "field_offset" : 160,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::HexDump",
+   "name" : "android::hardware::HexDump",
+   "record_kind" : "class",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2486",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
@@ -22366,6 +34939,426 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2379",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2375",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-496"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-430"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-431"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-432"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-431"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-2348"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-2348"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-99"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-472"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-2436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-2437"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-2433"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -22422,6 +35415,373 @@
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-2349"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-291"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-2350"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-2351"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-21"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-21"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2376",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-245"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-2440"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-447"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-428"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-2432"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-245"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-433"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-221"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 808,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 864,
+     "referenced_type" : "type-246"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 896,
+     "referenced_type" : "type-2433"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
+   "size" : 128,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 116,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2329"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-35"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -22687,6 +36047,89 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput",
+   "name" : "android::hardware::TextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTO",
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TextOutput::Bundle",
+   "name" : "android::hardware::TextOutput::Bundle",
+   "record_kind" : "class",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCode",
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TypeCode",
+   "name" : "android::hardware::TypeCode",
+   "record_kind" : "class",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2482",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -24241,8 +37684,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE",
@@ -27917,6 +41360,52 @@
    "fields" :
    [
     {
+     "field_name" : "key",
+     "referenced_type" : "type-342"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-71"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3807",
+   "self_type" : "type-3807",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342", "type-71" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "key",
+     "referenced_type" : "type-139"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-2344"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "m_ptr",
      "referenced_type" : "type-500"
@@ -27959,6 +41448,26 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
+     "referenced_type" : "type-2471"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2470",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2473" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
      "referenced_type" : "type-158"
     }
    ],
@@ -28274,6 +41783,270 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
+   "name" : "android::trait_pointer<android::RefBase *>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3747",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3746",
+   "self_type" : "type-3746",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::String16>",
+   "name" : "android::trait_pointer<android::String16>",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3865",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3745",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3863",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3864",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2460",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2530",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3866",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<const void *>",
+   "name" : "android::trait_pointer<const void *>",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2461",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<int>",
+   "name" : "android::trait_pointer<int>",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3884",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
+   "name" : "android::trait_trivial_copy<android::RefBase *>",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3741",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3740",
+   "self_type" : "type-3740",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
+   "name" : "android::trait_trivial_copy<android::String16>",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3857",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3737",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3856",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3859",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2528",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3858",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
    "referenced_type" : "type-191",
@@ -28296,6 +42069,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<const void *>",
+   "name" : "android::trait_trivial_copy<const void *>",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
    "referenced_type" : "type-529",
@@ -28428,6 +42212,127 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase *>",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3683",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3673",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
+   "name" : "android::trait_trivial_ctor<android::String16>",
+   "referenced_type" : "type-3850",
+   "self_type" : "type-3850",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3662",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3848",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3849",
+   "self_type" : "type-3849",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2469",
+   "self_type" : "type-2469",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3851",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
    "referenced_type" : "type-189",
@@ -28450,6 +42355,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
+   "name" : "android::trait_trivial_ctor<const void *>",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2445",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
    "referenced_type" : "type-522",
@@ -28582,6 +42498,127 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase *>",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3735",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3726",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
+   "name" : "android::trait_trivial_dtor<android::String16>",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3853",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3715",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2449",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3852",
+   "self_type" : "type-3852",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3855",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2527",
+   "self_type" : "type-2527",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3854",
+   "self_type" : "type-3854",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
    "referenced_type" : "type-190",
@@ -28604,6 +42641,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
+   "name" : "android::trait_trivial_dtor<const void *>",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
    "referenced_type" : "type-526",
@@ -28736,6 +42784,28 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
+   "name" : "android::trait_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3744",
+   "self_type" : "type-3744",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3743",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
    "referenced_type" : "type-353",
@@ -28758,6 +42828,94 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3742",
+   "self_type" : "type-3742",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3860",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3862",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2458",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3861",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
    "referenced_type" : "type-192",
@@ -28780,6 +42938,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<const void *>",
+   "name" : "android::trait_trivial_move<const void *>",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
    "referenced_type" : "type-536",
@@ -28911,6 +43080,302 @@
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase *>",
+   "name" : "android::traits<android::RefBase *>",
+   "referenced_type" : "type-3750",
+   "self_type" : "type-3750",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
+   "name" : "android::traits<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3749",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::String16>",
+   "name" : "android::traits<android::String16>",
+   "referenced_type" : "type-3869",
+   "self_type" : "type-3869",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
+   "name" : "android::traits<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3748",
+   "self_type" : "type-3748",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2467",
+   "self_type" : "type-2467",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3867",
+   "self_type" : "type-3867",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3868",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2464",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2531",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3870",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<const void *>",
+   "name" : "android::traits<const void *>",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android6traitsIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<int>",
+   "name" : "android::traits<int>",
+   "referenced_type" : "type-3885",
+   "self_type" : "type-3885",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android6traitsIiEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3618"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
+   "name" : "android::use_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3617",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3616"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3615",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3614"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3613",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2396"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3816"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3815",
+   "self_type" : "type-3815",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3818"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3817",
+   "self_type" : "type-3817",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2394"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2533"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2532",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3873"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<int>",
+   "name" : "android::use_trivial_move<int>",
+   "referenced_type" : "type-3872",
+   "self_type" : "type-3872",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -28969,6 +43434,32 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
+     "referenced_type" : "type-2329"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-35"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::hardware::IBinder>",
+   "name" : "android::wp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-2328" ],
+   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
      "referenced_type" : "type-143"
     },
     {
@@ -29569,6 +44060,33 @@
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lock",
+     "referenced_type" : "type-2513"
+    },
+    {
+     "field_name" : "has_tls",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "tls",
+     "field_offset" : 64,
+     "referenced_type" : "type-19"
+    }
+   ],
+   "linker_set_key" : "thread_store_t",
+   "name" : "thread_store_t",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
+   "size" : 12,
+   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
+   "unique_id" : "thread_store_t"
   }
  ],
  "rvalue_reference_types" :
@@ -29746,6 +44264,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-962",
+   "self_type" : "type-2422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
    "referenced_type" : "type-71",
@@ -29901,8 +44428,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29910,8 +44437,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29919,8 +44446,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29928,8 +44455,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29937,8 +44464,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29946,8 +44473,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2285",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3296",
+   "self_type" : "type-3295",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3363",
+   "self_type" : "type-3362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3416",
+   "self_type" : "type-3415",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30000,8 +44581,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30009,8 +44590,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30018,8 +44599,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30027,8 +44608,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30036,8 +44617,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30045,8 +44626,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2289",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3367",
+   "self_type" : "type-3366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3419",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30099,8 +44734,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2013",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30108,8 +44743,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2040",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30117,8 +44752,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30126,8 +44761,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30135,8 +44770,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30144,8 +44779,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2287",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3298",
+   "self_type" : "type-3297",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3365",
+   "self_type" : "type-3364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3417",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/29/64/arm_armv7-a-neon/source-based/libhwbinder.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libhwbinder.so.lsdump
index 780eb62..e1938ec 100644
--- a/29/64/arm_armv7-a-neon/source-based/libhwbinder.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libhwbinder.so.lsdump
@@ -1,291 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-191",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [10]",
-   "name" : "char [10]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-648",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [11]",
-   "name" : "char [11]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-670",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [12]",
-   "name" : "char [12]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-645",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [13]",
-   "name" : "char [13]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-641",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [14]",
-   "name" : "char [14]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-689",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [15]",
-   "name" : "char [15]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-122",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-673",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [17]",
-   "name" : "char [17]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-692",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [18]",
-   "name" : "char [18]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-677",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [19]",
-   "name" : "char [19]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-708",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [20]",
-   "name" : "char [20]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-686",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [22]",
-   "name" : "char [22]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-711",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [25]",
-   "name" : "char [25]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-701",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [28]",
-   "name" : "char [28]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-724",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [29]",
-   "name" : "char [29]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-698",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [2]",
-   "name" : "char [2]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-651",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [31]",
-   "name" : "char [31]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-683",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-714",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [35]",
-   "name" : "char [35]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-704",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [37]",
-   "name" : "char [37]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-695",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [3]",
-   "name" : "char [3]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-663",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4]",
-   "name" : "char [4]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [5]",
-   "name" : "char [5]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-125",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [6]",
-   "name" : "char [6]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-655",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [7]",
-   "name" : "char [7]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-680",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [8]",
-   "name" : "char [8]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-667",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [9]",
-   "name" : "char [9]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-658",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-95",
-   "self_type" : "type-301",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-10",
-   "self_type" : "type-84",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-66",
-   "self_type" : "type-242",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-4",
-   "self_type" : "type-292",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -294,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1
   },
   {
@@ -304,43 +18,25 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 1
   },
   {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char16_t",
-   "name" : "char16_t",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
-   "size" : 2
-  },
-  {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 8
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-7",
+   "self_type" : "type-7",
    "size" : 4
   },
   {
@@ -348,16 +44,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 8
   },
   {
@@ -365,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 8
   },
   {
@@ -374,27 +70,18 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 2
   },
   {
    "alignment" : 1,
    "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 1
   },
   {
@@ -403,8 +90,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4
   },
   {
@@ -413,8 +100,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -423,8 +110,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 8
   },
   {
@@ -433,16882 +120,46 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+   "name" : "__aeabi_memclr"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "__aeabi_memclr4"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+   "name" : "__aeabi_memclr8"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+   "name" : "__aeabi_memset"
   },
   {
-   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+   "name" : "__aeabi_memset4"
   },
   {
-   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel6removeEjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8growDataEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9initStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4dataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
-  },
-  {
-   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "getHWBinderKernelReferences"
-  },
-  {
-   "name" : "printHexData"
-  },
-  {
-   "name" : "printTypeCode"
-  },
-  {
-   "name" : "stringForIndent"
+   "name" : "__aeabi_memset8"
   }
  ],
- "elf_objects" :
- [
-  {
-   "name" : "_ZN7android8hardware12gTextBuffersE"
-  },
-  {
-   "name" : "_ZN7android8hardware13gProcessMutexE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aerrE"
-  },
-  {
-   "name" : "_ZN7android8hardware4alogE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aoutE"
-  },
-  {
-   "name" : "_ZN7android8hardware8gProcessE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10IInterfaceE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware12ProcessStateE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIiEE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10IInterfaceE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware10PoolThreadE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10TextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware12FdTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware12ProcessStateE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware13LogTextOutputE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String16::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String16::StaticLinkage",
-   "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
-   "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-10",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    }
-   ],
-   "referenced_type" : "type-512",
-   "return_type" : "type-508",
-   "self_type" : "type-512",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-200"
-    },
-    {
-     "referenced_type" : "type-159"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-199",
-   "return_type" : "type-38",
-   "self_type" : "type-199",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-305",
-   "return_type" : "type-10",
-   "self_type" : "type-305",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-520"
-    }
-   ],
-   "referenced_type" : "type-519",
-   "return_type" : "type-520",
-   "self_type" : "type-519",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-70",
-   "return_type" : "type-13",
-   "self_type" : "type-70",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (const void *, void *, void *)",
-   "name" : "void (const void *, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-336",
-   "return_type" : "type-13",
-   "self_type" : "type-336",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-203"
-    }
-   ],
-   "referenced_type" : "type-576",
-   "return_type" : "type-13",
-   "self_type" : "type-576",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-471"
-    },
-    {
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-192",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-586"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-586"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-406"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-48",
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-435"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-578",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::sendObituary",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-445"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-746"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-589"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-582"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-266"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-266"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-266"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-266"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
-   "return_type" : "type-193",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMaxThreads",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::startThreadPool",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-200"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-193",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-159"
-    },
-    {
-     "referenced_type" : "type-200"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-140",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setCallRestriction",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-206"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getKernelReferences",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::becomeContextManager",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-198"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-202",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-32",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::self",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
-   "return_type" : "type-193",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
-   "return_type" : "type-629",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::clearCaller",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::stopProcess",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setupPolling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-633"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::flushCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearLastError",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::executeCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-633"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-636"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-466"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-93",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-633"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::self",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
-   "return_type" : "type-629",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::process",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-193",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::shutdown",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::transact",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::sendReply",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::release_object",
-   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-608"
-    },
-    {
-     "referenced_type" : "type-81"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
-   "return_type" : "type-536",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::print",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "referenced_type" : "type-203"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeFloat",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-95"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::finishWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeDouble",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeObject",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-81"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-747" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-91"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-68"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::restartWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeCString",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-203"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInplace",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::writePointer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::continueWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-136"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-200"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-78"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUnpadded",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::acquireObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::freeDataNoInit",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::releaseObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataCapacity",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeWeakBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-44"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeStrongBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-203"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
-   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::incrementNumReferences",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
-   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::write",
-   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::remove",
-   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::freeData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::growData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setError",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::initState",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBool",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-87"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-516"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-516"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-8",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-578",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::onTransact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-748"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-8",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-130",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-749"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "referenced_type" : "type-272"
-    }
-   ],
-   "return_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "referenced_type" : "type-269"
-    }
-   ],
-   "return_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-337"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-459"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::isContextManager",
-   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-203",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isServingCall",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
-   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-540"
-    }
-   ],
-   "return_type" : "type-503",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::clearCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::errorCheck",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::findBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-98"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-96"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-97",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-751" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-67"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-68",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::scanForFds",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcDataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readCString",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-203",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-103",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::updateCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataCapacity",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::objectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-562"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-135",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcBufferSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readWeakBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-32",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::quickFindBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::enforceInterface",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-203"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-586"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::verifyBufferObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-108"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16Inplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-136",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferChild",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferParent",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-586"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    },
-    {
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::data",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::read",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::print",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcData",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::objects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-74",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-86"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataAvail",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-94"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-95",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-633"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-92"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-93",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-65"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::checkSubclass",
-   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-568"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-127"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::getHWBinderKernelReferences",
-   "linker_set_key" : "getHWBinderKernelReferences",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printHexData",
-   "linker_set_key" : "printHexData",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-10"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printTypeCode",
-   "linker_set_key" : "printTypeCode",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::stringForIndent",
-   "linker_set_key" : "stringForIndent",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-203",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "global_vars" :
- [
-  {
-   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
-   "name" : "android::hardware::gTextBuffers",
-   "referenced_type" : "type-543",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
-   "name" : "android::hardware::gProcessMutex",
-   "referenced_type" : "type-312",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aerrE",
-   "name" : "android::hardware::aerr",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4alogE",
-   "name" : "android::hardware::alog",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aoutE",
-   "name" : "android::hardware::aout",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware8gProcessE",
-   "name" : "android::hardware::gProcess",
-   "referenced_type" : "type-752",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  }
- ],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-312",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-316",
-   "self_type" : "type-320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const &",
-   "name" : "android::RefBase *const &",
-   "referenced_type" : "type-597",
-   "self_type" : "type-620",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const &",
-   "name" : "android::RefBase::weakref_type *const &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 &",
-   "name" : "android::String16 &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-555",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-202",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const &",
-   "name" : "android::hardware::BHwBinder *const &",
-   "referenced_type" : "type-593",
-   "self_type" : "type-612",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump &",
-   "name" : "android::hardware::HexDump &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-517",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
-   "name" : "android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-141",
-   "self_type" : "type-179",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-267",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-408",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
-   "name" : "android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-466",
-   "self_type" : "type-626",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-502",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &",
-   "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
-   "name" : "android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-193",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
-   "name" : "android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *const &",
-   "name" : "char *const &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[10]",
-   "name" : "char const (&)[10]",
-   "referenced_type" : "type-647",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[11]",
-   "name" : "char const (&)[11]",
-   "referenced_type" : "type-669",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[12]",
-   "name" : "char const (&)[12]",
-   "referenced_type" : "type-644",
-   "self_type" : "type-646",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[13]",
-   "name" : "char const (&)[13]",
-   "referenced_type" : "type-640",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[14]",
-   "name" : "char const (&)[14]",
-   "referenced_type" : "type-688",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[15]",
-   "name" : "char const (&)[15]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[16]",
-   "name" : "char const (&)[16]",
-   "referenced_type" : "type-672",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[17]",
-   "name" : "char const (&)[17]",
-   "referenced_type" : "type-691",
-   "self_type" : "type-693",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[18]",
-   "name" : "char const (&)[18]",
-   "referenced_type" : "type-676",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[19]",
-   "name" : "char const (&)[19]",
-   "referenced_type" : "type-707",
-   "self_type" : "type-709",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[20]",
-   "name" : "char const (&)[20]",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[22]",
-   "name" : "char const (&)[22]",
-   "referenced_type" : "type-710",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[25]",
-   "name" : "char const (&)[25]",
-   "referenced_type" : "type-700",
-   "self_type" : "type-702",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[28]",
-   "name" : "char const (&)[28]",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[29]",
-   "name" : "char const (&)[29]",
-   "referenced_type" : "type-697",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[2]",
-   "name" : "char const (&)[2]",
-   "referenced_type" : "type-650",
-   "self_type" : "type-652",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[31]",
-   "name" : "char const (&)[31]",
-   "referenced_type" : "type-682",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[32]",
-   "name" : "char const (&)[32]",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[35]",
-   "name" : "char const (&)[35]",
-   "referenced_type" : "type-703",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[37]",
-   "name" : "char const (&)[37]",
-   "referenced_type" : "type-694",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[3]",
-   "name" : "char const (&)[3]",
-   "referenced_type" : "type-662",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[4]",
-   "name" : "char const (&)[4]",
-   "referenced_type" : "type-118",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[5]",
-   "name" : "char const (&)[5]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[6]",
-   "name" : "char const (&)[6]",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[7]",
-   "name" : "char const (&)[7]",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[8]",
-   "name" : "char const (&)[8]",
-   "referenced_type" : "type-666",
-   "self_type" : "type-668",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[9]",
-   "name" : "char const (&)[9]",
-   "referenced_type" : "type-657",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-201",
-   "self_type" : "type-200",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-463",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
-   "name" : "const android::hardware::BpHwBinder::Obituary &",
-   "referenced_type" : "type-415",
-   "self_type" : "type-445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "referenced_type" : "type-422",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump &",
-   "name" : "const android::hardware::HexDump &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-62",
-   "self_type" : "type-730",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
-   "name" : "const android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-143",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode &",
-   "name" : "const android::hardware::TypeCode &",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-133",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
-   "name" : "const android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-631",
-   "self_type" : "type-639",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-433",
-   "self_type" : "type-435",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-5",
-   "self_type" : "type-30",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-753",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-821",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1090",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1102",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-553",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-573",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-859",
-   "self_type" : "type-861",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-865",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
-   "name" : "const android::sp<android::hardware::IInterface> &",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
-   "name" : "const android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char &",
-   "name" : "const char &",
-   "referenced_type" : "type-204",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const &",
-   "name" : "const char *const &",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-350",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-776",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-910",
-   "self_type" : "type-912",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-309",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-248",
-   "self_type" : "type-251",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-399",
-   "self_type" : "type-400",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1159",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-634",
-   "self_type" : "type-636",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-884",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-76",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-773",
-   "self_type" : "type-775",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-907",
-   "self_type" : "type-909",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *const &",
-   "name" : "const unsigned char *const &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-719",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-56",
-   "self_type" : "type-55",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *const &",
-   "name" : "const unsigned int *const &",
-   "referenced_type" : "type-720",
-   "self_type" : "type-722",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-299",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *const &",
-   "name" : "const void *const &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int &",
-   "name" : "int &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1060",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-812",
-   "self_type" : "type-811",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-976",
-   "self_type" : "type-975",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *const &",
-   "name" : "void *const &",
-   "referenced_type" : "type-660",
-   "self_type" : "type-661",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-735",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1040",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-468",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase **",
-   "name" : "android::RefBase **",
-   "referenced_type" : "type-23",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const *",
-   "name" : "android::RefBase *const *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1105",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1126",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-157",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-759",
-   "self_type" : "type-758",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-835",
-   "self_type" : "type-834",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-987",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type **",
-   "name" : "android::RefBase::weakref_type **",
-   "referenced_type" : "type-20",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const *",
-   "name" : "android::RefBase::weakref_type *const *",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-332",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-500",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase *> *",
-   "name" : "android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-617",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-447",
-   "self_type" : "type-613",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-621",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-638",
-   "self_type" : "type-637",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-903",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-548",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-364",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder **",
-   "name" : "android::hardware::BHwBinder **",
-   "referenced_type" : "type-8",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const *",
-   "name" : "android::hardware::BHwBinder *const *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder *",
-   "name" : "android::hardware::BpHwBinder *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
-   "name" : "android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwRefBase *",
-   "name" : "android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-155",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput *",
-   "name" : "android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-535",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-256",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-968",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-856",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump *",
-   "name" : "android::hardware::HexDump *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder *",
-   "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IPCThreadState *",
-   "name" : "android::hardware::IPCThreadState *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-629",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState *",
-   "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
-   "name" : "android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "referenced_type" : "type-512",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput *",
-   "name" : "android::hardware::TextOutput *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
-   "name" : "android::hardware::TextOutput::Bundle *",
-   "referenced_type" : "type-507",
-   "self_type" : "type-509",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TypeCode *",
-   "name" : "android::hardware::TypeCode *",
-   "referenced_type" : "type-271",
-   "self_type" : "type-514",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-142",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-412",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Thread> *",
-   "name" : "android::sp<android::Thread> *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
-   "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-466",
-   "self_type" : "type-625",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-454",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> *",
-   "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
-   "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-471",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-112",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
-   "name" : "android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-406",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-114",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-733",
-   "self_type" : "type-734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-183",
-   "self_type" : "type-185",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-201",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase *> *",
-   "name" : "const android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-619",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-611",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-178",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-545",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BHwBinder *",
-   "name" : "const android::hardware::BHwBinder *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder *",
-   "name" : "const android::hardware::BpHwBinder *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
-   "name" : "const android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-415",
-   "self_type" : "type-416",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwRefBase *",
-   "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
-   "name" : "const android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-539",
-   "self_type" : "type-540",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump *",
-   "name" : "const android::hardware::HexDump *",
-   "referenced_type" : "type-273",
-   "self_type" : "type-518",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
-   "name" : "const android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-452",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IInterface *",
-   "name" : "const android::hardware::IInterface *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-589",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IPCThreadState *",
-   "name" : "const android::hardware::IPCThreadState *",
-   "referenced_type" : "type-630",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel *",
-   "name" : "const android::hardware::Parcel *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState *",
-   "name" : "const android::hardware::ProcessState *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
-   "name" : "const android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode *",
-   "name" : "const android::hardware::TypeCode *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-515",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-414",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Thread> *",
-   "name" : "const android::sp<android::Thread> *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
-   "name" : "const android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-631",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-433",
-   "self_type" : "type-456",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
-   "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
-   "name" : "const android::sp<android::hardware::IInterface> *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
-   "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-441",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
-   "name" : "const android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-794",
-   "self_type" : "type-796",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char16_t *",
-   "name" : "const char16_t *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-776",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-910",
-   "self_type" : "type-915",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-546",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-248",
-   "self_type" : "type-250",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-85",
-   "self_type" : "type-105",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *",
-   "name" : "const unsigned int *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-721",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long *",
-   "name" : "const unsigned long long *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void **",
-   "name" : "const void **",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double *",
-   "name" : "double *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float *",
-   "name" : "float *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-305",
-   "self_type" : "type-306",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-240",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long *",
-   "name" : "long long *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "short *",
-   "name" : "short *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "signed char *",
-   "name" : "signed char *",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "referenced_type" : "type-519",
-   "self_type" : "type-522",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-914",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-572",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long long *",
-   "name" : "unsigned long long *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned short *",
-   "name" : "unsigned short *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(const void *, void *, void *)",
-   "name" : "void (*)(const void *, void *, void *)",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-576",
-   "self_type" : "type-577",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase *const",
-   "name" : "android::RefBase *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1066",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-156",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-245",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-427",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-45",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-528",
-   "self_type" : "type-530",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-569",
-   "self_type" : "type-571",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-579",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-605",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-758",
-   "self_type" : "type-761",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-816",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-834",
-   "self_type" : "type-836",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-853",
-   "self_type" : "type-855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-869",
-   "self_type" : "type-871",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-875",
-   "self_type" : "type-877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-898",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-934",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-963",
-   "self_type" : "type-965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_type *const",
-   "name" : "android::RefBase::weakref_type *const",
-   "referenced_type" : "type-20",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::BHwBinder *const",
-   "name" : "android::hardware::BHwBinder *const",
-   "referenced_type" : "type-8",
-   "self_type" : "type-593",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::IBinder *const",
-   "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-33",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "char *const",
-   "name" : "char *const",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[10]",
-   "name" : "char const[10]",
-   "referenced_type" : "type-648",
-   "self_type" : "type-647",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[11]",
-   "name" : "char const[11]",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[12]",
-   "name" : "char const[12]",
-   "referenced_type" : "type-645",
-   "self_type" : "type-644",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[13]",
-   "name" : "char const[13]",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[14]",
-   "name" : "char const[14]",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[15]",
-   "name" : "char const[15]",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[16]",
-   "name" : "char const[16]",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[17]",
-   "name" : "char const[17]",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[18]",
-   "name" : "char const[18]",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[19]",
-   "name" : "char const[19]",
-   "referenced_type" : "type-708",
-   "self_type" : "type-707",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[20]",
-   "name" : "char const[20]",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[22]",
-   "name" : "char const[22]",
-   "referenced_type" : "type-711",
-   "self_type" : "type-710",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[25]",
-   "name" : "char const[25]",
-   "referenced_type" : "type-701",
-   "self_type" : "type-700",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[28]",
-   "name" : "char const[28]",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[29]",
-   "name" : "char const[29]",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[2]",
-   "name" : "char const[2]",
-   "referenced_type" : "type-651",
-   "self_type" : "type-650",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[31]",
-   "name" : "char const[31]",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[32]",
-   "name" : "char const[32]",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[35]",
-   "name" : "char const[35]",
-   "referenced_type" : "type-704",
-   "self_type" : "type-703",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[37]",
-   "name" : "char const[37]",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[3]",
-   "name" : "char const[3]",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[4]",
-   "name" : "char const[4]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-118",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[5]",
-   "name" : "char const[5]",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[6]",
-   "name" : "char const[6]",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[7]",
-   "name" : "char const[7]",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[8]",
-   "name" : "char const[8]",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[9]",
-   "name" : "char const[9]",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-182",
-   "self_type" : "type-183",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-450",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-15",
-   "self_type" : "type-430",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-167",
-   "self_type" : "type-171",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-332",
-   "self_type" : "type-437",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-135",
-   "self_type" : "type-201",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-202",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase *>",
-   "name" : "const android::Vector<android::RefBase *>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-618",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
-   "name" : "const android::Vector<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-614",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
-   "name" : "const android::Vector<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-610",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-443",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-177",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<int>",
-   "name" : "const android::Vector<int>",
-   "referenced_type" : "type-543",
-   "self_type" : "type-544",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-169",
-   "self_type" : "type-258",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BHwBinder",
-   "name" : "const android::hardware::BHwBinder",
-   "referenced_type" : "type-9",
-   "self_type" : "type-117",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder",
-   "name" : "const android::hardware::BpHwBinder",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
-   "name" : "const android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-338",
-   "self_type" : "type-415",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager",
-   "referenced_type" : "type-330",
-   "self_type" : "type-458",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-334",
-   "self_type" : "type-422",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwRefBase",
-   "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-146",
-   "self_type" : "type-161",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput",
-   "name" : "const android::hardware::BufferedTextOutput",
-   "referenced_type" : "type-534",
-   "self_type" : "type-539",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::HexDump",
-   "name" : "const android::hardware::HexDump",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder",
-   "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-14",
-   "self_type" : "type-567",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
-   "name" : "const android::hardware::IBinder::DeathRecipient",
-   "referenced_type" : "type-60",
-   "self_type" : "type-452",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IInterface",
-   "name" : "const android::hardware::IInterface",
-   "referenced_type" : "type-339",
-   "self_type" : "type-588",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IPCThreadState",
-   "name" : "const android::hardware::IPCThreadState",
-   "referenced_type" : "type-464",
-   "self_type" : "type-630",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState",
-   "name" : "const android::hardware::ProcessState",
-   "referenced_type" : "type-195",
-   "self_type" : "type-211",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
-   "name" : "const android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::TypeCode",
-   "name" : "const android::hardware::TypeCode",
-   "referenced_type" : "type-271",
-   "self_type" : "type-270",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Thread>",
-   "name" : "const android::sp<android::Thread>",
-   "referenced_type" : "type-34",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
-   "name" : "const android::sp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "referenced_type" : "type-502",
-   "self_type" : "type-526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-754",
-   "self_type" : "type-753",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-51",
-   "self_type" : "type-160",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
-   "name" : "const android::sp<android::hardware::IInterface>",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
-   "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-193",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
-   "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-115",
-   "self_type" : "type-204",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-203",
-   "self_type" : "type-510",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const char16_t",
-   "name" : "const char16_t",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-97",
-   "self_type" : "type-350",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-777",
-   "self_type" : "type-776",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-95",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-240",
-   "self_type" : "type-248",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-93",
-   "self_type" : "type-145",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-89",
-   "self_type" : "type-402",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-87",
-   "self_type" : "type-399",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-774",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-66",
-   "self_type" : "type-73",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char *const",
-   "name" : "const unsigned char *const",
-   "referenced_type" : "type-72",
-   "self_type" : "type-718",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int *const",
-   "name" : "const unsigned int *const",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-68",
-   "self_type" : "type-75",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-91",
-   "self_type" : "type-404",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-104",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const void *const",
-   "name" : "const void *const",
-   "referenced_type" : "type-103",
-   "self_type" : "type-410",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-12",
-   "self_type" : "type-660",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile int",
-   "name" : "volatile int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-205",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-425"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "d_",
-     "field_offset" : 32,
-     "referenced_type" : "type-532"
-    },
-    {
-     "access" : "private",
-     "field_name" : "s_",
-     "field_offset" : 64,
-     "referenced_type" : "type-533"
-    }
-   ],
-   "linker_set_key" : "Renamer",
-   "name" : "Renamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
-    },
-    {
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-621"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-167"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-135", "type-51" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-332"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-103", "type-334" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-3" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-40"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-312"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-317"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-320"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-320"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-16"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "record_kind" : "class",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-170" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-333" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-136"
-    }
-   ],
-   "linker_set_key" : "android::String16",
-   "name" : "android::String16",
-   "record_kind" : "class",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "unique_id" : "_ZTSN7android8String16E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-203"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-41"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-43"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-43"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-34"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase *>",
-   "name" : "android::Vector<android::RefBase *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
-   "name" : "android::Vector<android::RefBase::weakref_type *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-202" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
-   "name" : "android::Vector<android::hardware::BHwBinder *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "record_kind" : "class",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<int>",
-   "name" : "android::Vector<int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android6VectorIiEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135", "type-51" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103", "type-334" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPolicy",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExtras",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReserved0",
-     "field_offset" : 128,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BHwBinder",
-   "name" : "android::hardware::BHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlive",
-     "field_offset" : 96,
-     "referenced_type" : "type-205"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObitsSent",
-     "field_offset" : 128,
-     "referenced_type" : "type-205"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObituaries",
-     "field_offset" : 160,
-     "referenced_type" : "type-328"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 192,
-     "referenced_type" : "type-330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mConstantData",
-     "field_offset" : 352,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDescriptorCache",
-     "field_offset" : 384,
-     "referenced_type" : "type-135"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder",
-   "name" : "android::hardware::BpHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 52,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "recipient",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "cookie",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
-   "name" : "android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "referenced_type" : "type-331"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
-   "name" : "android::hardware::BpHwBinder::ObjectManager",
-   "record_kind" : "class",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "object",
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cleanupCookie",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "func",
-     "field_offset" : 64,
-     "referenced_type" : "type-335"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRemote",
-     "field_offset" : 32,
-     "referenced_type" : "type-147"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 96,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwRefBase",
-   "name" : "android::hardware::BpHwRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSeq",
-     "field_offset" : 64,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 128,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGlobalState",
-     "field_offset" : 160,
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BufferedTextOutput",
-   "name" : "android::hardware::BufferedTextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBytesPerLine",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSingleLineCutoff",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlignment",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCArrayStyle",
-     "field_offset" : 160,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "linker_set_key" : "android::hardware::HexDump",
-   "name" : "android::hardware::HexDump",
-   "record_kind" : "class",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder",
-   "name" : "android::hardware::IBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
-   "name" : "android::hardware::IBinder::DeathRecipient",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IInterface",
-   "name" : "android::hardware::IInterface",
-   "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mProcess",
-     "referenced_type" : "type-465"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingStrongDerefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-446"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingWeakDerefs",
-     "field_offset" : 192,
-     "referenced_type" : "type-447"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteStrongDerefs",
-     "field_offset" : 352,
-     "referenced_type" : "type-448"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteWeakDerefs",
-     "field_offset" : 512,
-     "referenced_type" : "type-447"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIn",
-     "field_offset" : 672,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOut",
-     "field_offset" : 1216,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastError",
-     "field_offset" : 1760,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingPid",
-     "field_offset" : 1792,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingSid",
-     "field_offset" : 1824,
-     "referenced_type" : "type-203"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingUid",
-     "field_offset" : 1856,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStrictModePolicy",
-     "field_offset" : 1888,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastTransactionBinderFlags",
-     "field_offset" : 1920,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContextObject",
-     "field_offset" : 1952,
-     "referenced_type" : "type-466"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsLooper",
-     "field_offset" : 1984,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsPollingThread",
-     "field_offset" : 1992,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostCommandTasks",
-     "field_offset" : 2016,
-     "referenced_type" : "type-467"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIPCThreadStateBase",
-     "field_offset" : 2112,
-     "referenced_type" : "type-468"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 2144,
-     "referenced_type" : "type-206"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IPCThreadState",
-   "name" : "android::hardware::IPCThreadState",
-   "record_kind" : "class",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
-   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBufCachePos",
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufCache",
-     "field_offset" : 32,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mError",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 160,
-     "referenced_type" : "type-65"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataCapacity",
-     "field_offset" : 224,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataPos",
-     "field_offset" : 256,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 288,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsCapacity",
-     "field_offset" : 352,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNextObjectHint",
-     "field_offset" : 384,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumRef",
-     "field_offset" : 416,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFdsKnown",
-     "field_offset" : 448,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHasFds",
-     "field_offset" : 456,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllowFds",
-     "field_offset" : 464,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 480,
-     "referenced_type" : "type-69"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnerCookie",
-     "field_offset" : 512,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel",
-   "name" : "android::hardware::Parcel",
-   "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6ParcelE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "index",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "buffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-68"
-    },
-    {
-     "field_name" : "bufend",
-     "field_offset" : 128,
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
-   "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDriverFD",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVMStart",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-196"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountDecrement",
-     "field_offset" : 128,
-     "referenced_type" : "type-197"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExecutingThreadsCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMaxThreads",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStarvationStartTimeMs",
-     "field_offset" : 256,
-     "referenced_type" : "type-93"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 320,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandleToObject",
-     "field_offset" : 352,
-     "referenced_type" : "type-174"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mManagesContexts",
-     "field_offset" : 512,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextCheckFunc",
-     "field_offset" : 544,
-     "referenced_type" : "type-198"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextUserData",
-     "field_offset" : 576,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContexts",
-     "field_offset" : 608,
-     "referenced_type" : "type-182"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRootDir",
-     "field_offset" : 768,
-     "referenced_type" : "type-202"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolStarted",
-     "field_offset" : 800,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSpawnThreadOnStart",
-     "field_offset" : 808,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolSeq",
-     "field_offset" : 832,
-     "referenced_type" : "type-205"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMmapSize",
-     "field_offset" : 864,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 896,
-     "referenced_type" : "type-206"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState",
-   "name" : "android::hardware::ProcessState",
-   "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 128,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 116,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -116,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -116,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "binder",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
-   "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput",
-   "name" : "android::hardware::TextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTO",
-     "referenced_type" : "type-508"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TextOutput::Bundle",
-   "name" : "android::hardware::TextOutput::Bundle",
-   "record_kind" : "class",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCode",
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TypeCode",
-   "name" : "android::hardware::TypeCode",
-   "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-135"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-51"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135", "type-51" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-334"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103", "type-334" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
-   "name" : "android::sp<android::hardware::BHwBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-505" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-585"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-194"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
-   "name" : "android::sp<android::hardware::ProcessState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
-   "name" : "android::trait_pointer<android::RefBase *>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::String16>",
-   "name" : "android::trait_pointer<android::String16>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<const void *>",
-   "name" : "android::trait_pointer<const void *>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<int>",
-   "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
-   "name" : "android::trait_trivial_copy<android::RefBase *>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
-   "name" : "android::trait_trivial_copy<android::String16>",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<const void *>",
-   "name" : "android::trait_trivial_copy<const void *>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
-   "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
-   "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase *>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
-   "name" : "android::trait_trivial_ctor<android::String16>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
-   "name" : "android::trait_trivial_ctor<const void *>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long long>",
-   "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-372",
-   "self_type" : "type-372",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
-   "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
-   "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
-   "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase *>",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
-   "name" : "android::trait_trivial_dtor<android::String16>",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
-   "name" : "android::trait_trivial_dtor<const void *>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long long>",
-   "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
-   "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
-   "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
-   "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
-   "name" : "android::trait_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String16>",
-   "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-202" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-349",
-   "self_type" : "type-349",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<const void *>",
-   "name" : "android::trait_trivial_move<const void *>",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned int>",
-   "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long>",
-   "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase *>",
-   "name" : "android::traits<android::RefBase *>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
-   "name" : "android::traits<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::String16>",
-   "name" : "android::traits<android::String16>",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
-   "name" : "android::traits<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<const void *>",
-   "name" : "android::traits<const void *>",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android6traitsIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<int>",
-   "name" : "android::traits<int>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android6traitsIiEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-604"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
-   "name" : "android::use_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-602"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-600"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-420"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-151"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-418"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-564"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<int>",
-   "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder>",
-   "name" : "android::wp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-295"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-298"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-65"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-293"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-292"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-241"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-231"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-231"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-220"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-213"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-190"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-191"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-191"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-191"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-191"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-84"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "lock",
-     "referenced_type" : "type-542"
-    },
-    {
-     "field_name" : "has_tls",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tls",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "thread_store_t",
-   "name" : "thread_store_t",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
-   "unique_id" : "thread_store_t"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "referenced_type" : "type-434",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
-   "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
+ "elf_objects" : [],
+ "enum_types" : [],
+ "function_types" : [],
+ "functions" : [],
+ "global_vars" : [],
+ "lvalue_reference_types" : [],
+ "pointer_types" : [],
+ "qualified_types" : [],
+ "record_types" : [],
+ "rvalue_reference_types" : []
 }
diff --git a/29/64/arm_armv8-a/source-based/libhidlbase.so.lsdump b/29/64/arm_armv8-a/source-based/libhidlbase.so.lsdump
index b8dfd34..12aeee8 100644
--- a/29/64/arm_armv8-a/source-based/libhidlbase.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libhidlbase.so.lsdump
@@ -11,6 +11,60 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "char [10]",
+   "name" : "char [10]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3656",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [11]",
+   "name" : "char [11]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3679",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [12]",
+   "name" : "char [12]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3653",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [13]",
+   "name" : "char [13]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3649",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [14]",
+   "name" : "char [14]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3698",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [15]",
+   "name" : "char [15]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3796",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
    "referenced_type" : "type-48",
@@ -19,6 +73,186 @@
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [17]",
+   "name" : "char [17]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3701",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [18]",
+   "name" : "char [18]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3685",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [19]",
+   "name" : "char [19]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3717",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [20]",
+   "name" : "char [20]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3695",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [22]",
+   "name" : "char [22]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3720",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [25]",
+   "name" : "char [25]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3710",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [28]",
+   "name" : "char [28]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3733",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [29]",
+   "name" : "char [29]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3707",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [2]",
+   "name" : "char [2]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3660",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [31]",
+   "name" : "char [31]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3692",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3724",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [35]",
+   "name" : "char [35]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3713",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [37]",
+   "name" : "char [37]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3704",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [3]",
+   "name" : "char [3]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3672",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4]",
+   "name" : "char [4]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3793",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [5]",
+   "name" : "char [5]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3799",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [6]",
+   "name" : "char [6]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3664",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [7]",
+   "name" : "char [7]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3688",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [8]",
+   "name" : "char [8]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3676",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [9]",
+   "name" : "char [9]",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3667",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
    "referenced_type" : "type-298",
@@ -227,10 +461,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
   },
   {
@@ -1182,6 +1432,78 @@
    "name" : "_ZN7android4hidl7manager4V1_218BpHwServiceManagerC2ERKNS_2spINS_8hardware7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE"
   },
   {
@@ -1212,6 +1534,36 @@
    "name" : "_ZN7android8hardware10HidlMemoryD2Ev"
   },
   {
+   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD2Ev"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
@@ -1228,6 +1580,30 @@
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl7manager4V1_215IServiceManagerENS4_18BpHwServiceManagerENS4_18BnHwServiceManagerEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware11hidl_handle10freeHandleEv"
   },
   {
@@ -1339,18 +1715,243 @@
    "name" : "_ZN7android8hardware11hidl_stringaSERKS1_"
   },
   {
+   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_6StatusEPNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
    "name" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware14readFromParcelERKNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_"
   },
   {
@@ -1363,9 +1964,45 @@
    "name" : "_ZN7android8hardware16setRequestingSidERKNS_2spINS_4hidl4base4V1_05IBaseEEEb"
   },
   {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android8hardware17joinRpcThreadpoolEv"
   },
   {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE"
   },
   {
@@ -1384,6 +2021,9 @@
    "name" : "_ZN7android8hardware20LazyServiceRegistrarC2Ev"
   },
   {
+   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware21defaultServiceManagerEv"
   },
   {
@@ -1450,6 +2090,184 @@
    "name" : "_ZN7android8hardware31setProcessHidlReturnRestrictionENS0_21HidlReturnRestrictionE"
   },
   {
+   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel6removeEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8growDataEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9initStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware6Status11fromStatusTEi"
   },
   {
@@ -1480,6 +2298,30 @@
    "name" : "_ZN7android8hardware6StatusC2EiiPKc"
   },
   {
+   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE"
   },
   {
@@ -1659,12 +2501,75 @@
    "name" : "_ZN7android8hardware7details25registerAsServiceInternalERKNS_2spINS_4hidl4base4V1_05IBaseEEERKNSt3__112basic_stringIcNSA_11char_traitsIcEENSA_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
+  },
+  {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE"
   },
   {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE"
   },
   {
+   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv"
   },
   {
@@ -1686,12 +2591,259 @@
    "name" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv"
   },
   {
+   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4dataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
+  },
+  {
    "name" : "_ZNK7android8hardware6Status11descriptionEv"
   },
   {
+   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware7details13return_status8assertOkEv"
   },
   {
+   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNKSt3__110__back_refIcE6__execERNS_7__stateIcEE"
   },
@@ -2544,12 +3696,66 @@
    "name" : "_ZTv0_n12_N7android4hidl7manager4V1_218BnHwServiceManagerD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+  },
+  {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD0Ev"
   },
   {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
    "name" : "__aeabi_l2d"
   },
   {
@@ -2608,6 +3814,18 @@
   },
   {
    "name" : "__udivsi3"
+  },
+  {
+   "name" : "getHWBinderKernelReferences"
+  },
+  {
+   "name" : "printHexData"
+  },
+  {
+   "name" : "printTypeCode"
+  },
+  {
+   "name" : "stringForIndent"
   }
  ],
  "elf_objects" :
@@ -2659,6 +3877,21 @@
    "name" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE"
   },
   {
+   "name" : "_ZN7android8hardware12gTextBuffersE"
+  },
+  {
+   "name" : "_ZN7android8hardware13gProcessMutexE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aerrE"
+  },
+  {
+   "name" : "_ZN7android8hardware4alogE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aoutE"
+  },
+  {
    "name" : "_ZN7android8hardware7details14gServiceSidMapE"
   },
   {
@@ -2674,6 +3907,9 @@
    "name" : "_ZN7android8hardware7details6gBnMapE"
   },
   {
+   "name" : "_ZN7android8hardware8gProcessE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android4hidl4base4V1_06BsBaseE0_NS2_5IBaseE"
   },
@@ -2869,6 +4105,13 @@
    "name" : "_ZTCN7android4hidl7manager4V1_218BpHwServiceManagerE8_NS_8hardware11BpHwRefBaseE"
   },
   {
+   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE0_NS4_5IBaseE"
   },
@@ -2898,6 +4141,9 @@
    "name" : "_ZTCN7android8hardware7details6WaiterE0_NS_4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE0_NS_13basic_istreamIcS2_EE"
   },
@@ -2915,6 +4161,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
   },
   {
@@ -2972,16 +4230,31 @@
    "name" : "_ZTTN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "name" : "_ZTTN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTTN7android8hardware10IInterfaceE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
+   "name" : "_ZTTN7android8hardware12ProcessStateE"
+  },
+  {
    "name" : "_ZTTN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTTN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware7details21ClientCounterCallbackE"
   },
   {
@@ -2989,6 +4262,9 @@
    "name" : "_ZTTN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTTN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE"
   },
@@ -3001,6 +4277,14 @@
    "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
    "name" : "_ZTVN7android4hidl4base4V1_05IBaseE"
   },
   {
@@ -3079,20 +4363,85 @@
    "name" : "_ZTVN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIiEE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTVN7android8hardware10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware10PoolThreadE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10TextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android8hardware12FdTextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware12ProcessStateE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware13LogTextOutputE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android8hardware25PassthroughServiceManagerE"
   },
   {
    "name" : "_ZTVN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTVN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware7details16HidlInstrumentorE"
   },
   {
@@ -3103,6 +4452,9 @@
    "name" : "_ZTVN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTVN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__110__back_refIcEE"
   },
@@ -3188,6 +4540,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -3391,6 +4747,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-19",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -4468,6 +5850,42 @@
  [
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "referenced_type" : "type-2480",
+   "return_type" : "type-2476",
+   "self_type" : "type-2480",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-350"
+    },
+    {
+     "referenced_type" : "type-69"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2430",
+   "return_type" : "type-44",
+   "self_type" : "type-2430",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (void *)",
    "name" : "int (void *)",
    "parameters" :
@@ -4480,6 +5898,90 @@
    "return_type" : "type-19",
    "self_type" : "type-303",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2492"
+    }
+   ],
+   "referenced_type" : "type-2491",
+   "return_type" : "type-2492",
+   "self_type" : "type-2491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2353"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2352",
+   "return_type" : "type-106",
+   "self_type" : "type-2352",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (const void *, void *, void *)",
+   "name" : "void (const void *, void *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "referenced_type" : "type-2346",
+   "return_type" : "type-106",
+   "self_type" : "type-2346",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (void *, const char *)",
+   "name" : "void (void *, const char *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "referenced_type" : "type-2541",
+   "return_type" : "type-106",
+   "self_type" : "type-2541",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "functions" :
@@ -4498,6 +6000,22 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-495"
+    },
+    {
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-3841",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::sp<android::hardware::PassthroughServiceManager>::~sp",
    "linker_set_key" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev",
    "parameters" :
@@ -4511,6 +6029,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-482"
+    },
+    {
+     "referenced_type" : "type-483"
+    }
+   ],
+   "return_type" : "type-485",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-482"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-485",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2381"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-3757",
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::hidl::base::V1_0::IBase::linkToDeath",
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy",
    "parameters" :
@@ -4539,7 +6105,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2574"
+     "referenced_type" : "type-2766"
     }
    ],
    "return_type" : "type-102",
@@ -4555,7 +6121,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2575"
+     "referenced_type" : "type-2767"
     }
    ],
    "return_type" : "type-102",
@@ -4587,7 +6153,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2576"
+     "referenced_type" : "type-2768"
     }
    ],
    "return_type" : "type-102",
@@ -4603,7 +6169,7 @@
      "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-2577"
+     "referenced_type" : "type-2769"
     }
    ],
    "return_type" : "type-102",
@@ -4691,10 +6257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
-     "referenced_type" : "type-2580"
+     "referenced_type" : "type-2772"
     }
    ],
    "return_type" : "type-102",
@@ -4707,7 +6273,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
      "referenced_type" : "type-459"
@@ -4723,7 +6289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2250"
     },
     {
      "referenced_type" : "type-459"
@@ -4741,13 +6307,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2583"
+     "referenced_type" : "type-2775"
     }
    ],
    "return_type" : "type-19",
@@ -4766,10 +6332,10 @@
      "referenced_type" : "type-1"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
      "default_arg" : true,
@@ -4777,7 +6343,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2584"
+     "referenced_type" : "type-2776"
     }
    ],
    "return_type" : "type-19",
@@ -4792,13 +6358,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2585"
+     "referenced_type" : "type-2777"
     }
    ],
    "return_type" : "type-19",
@@ -4815,7 +6381,7 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2586"
+     "referenced_type" : "type-2778"
     }
    ],
    "return_type" : "type-102",
@@ -4830,13 +6396,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2587"
+     "referenced_type" : "type-2779"
     }
    ],
    "return_type" : "type-19",
@@ -4851,13 +6417,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2588"
+     "referenced_type" : "type-2780"
     }
    ],
    "return_type" : "type-19",
@@ -4872,13 +6438,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2589"
+     "referenced_type" : "type-2781"
     }
    ],
    "return_type" : "type-19",
@@ -4893,13 +6459,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2590"
+     "referenced_type" : "type-2782"
     }
    ],
    "return_type" : "type-19",
@@ -4914,13 +6480,13 @@
      "referenced_type" : "type-358"
     },
     {
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2280"
     },
     {
-     "referenced_type" : "type-2307"
+     "referenced_type" : "type-2281"
     },
     {
-     "referenced_type" : "type-2591"
+     "referenced_type" : "type-2783"
     }
    ],
    "return_type" : "type-19",
@@ -4969,10 +6535,10 @@
      "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     }
    ],
    "return_type" : "type-106",
@@ -5007,10 +6573,10 @@
      "referenced_type" : "type-460"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2277"
     }
    ],
    "return_type" : "type-106",
@@ -5061,7 +6627,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5076,7 +6642,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5120,7 +6686,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2592"
+     "referenced_type" : "type-2784"
     }
    ],
    "return_type" : "type-102",
@@ -5136,7 +6702,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2593"
+     "referenced_type" : "type-2785"
     }
    ],
    "return_type" : "type-102",
@@ -5168,7 +6734,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2594"
+     "referenced_type" : "type-2786"
     }
    ],
    "return_type" : "type-102",
@@ -5180,13 +6746,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2595"
+     "referenced_type" : "type-2787"
     }
    ],
    "return_type" : "type-102",
@@ -5198,13 +6764,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2596"
+     "referenced_type" : "type-2788"
     }
    ],
    "return_type" : "type-102",
@@ -5220,7 +6786,7 @@
      "referenced_type" : "type-960"
     },
     {
-     "referenced_type" : "type-2597"
+     "referenced_type" : "type-2789"
     }
    ],
    "return_type" : "type-102",
@@ -5232,13 +6798,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2598"
+     "referenced_type" : "type-2790"
     }
    ],
    "return_type" : "type-102",
@@ -5276,13 +6842,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-2599"
+     "referenced_type" : "type-2791"
     }
    ],
    "return_type" : "type-102",
@@ -5294,7 +6860,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -5309,7 +6875,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2253"
     },
     {
      "referenced_type" : "type-194"
@@ -9924,6 +11490,416 @@
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2406"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-2335",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::sendObituary",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2424"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2360"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-949"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-2415"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2792"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::HidlMemory::getInstance",
    "linker_set_key" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE",
    "parameters" :
@@ -10079,6 +12055,137 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2553"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2546"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2550"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2550"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2550"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2550"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3886"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::fromBinder",
    "linker_set_key" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE",
    "parameters" :
@@ -10131,6 +12238,133 @@
    "template_args" : [ "type-565", "type-774", "type-845" ]
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
    "access" : "private",
    "function_name" : "android::hardware::hidl_handle::freeHandle",
    "linker_set_key" : "_ZN7android8hardware11hidl_handle10freeHandleEv",
@@ -10712,6 +12946,415 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMaxThreads",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::startThreadPool",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-350"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-69"
+    },
+    {
+     "referenced_type" : "type-350"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-3809",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setCallRestriction",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-2433"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getKernelReferences",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::becomeContextManager",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-2432"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-221",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-2382",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::self",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2443"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "function_name" : "android::hardware::writeToParcel",
    "linker_set_key" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE",
    "parameters" :
@@ -10742,6 +13385,699 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2353"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
+   "return_type" : "type-3638",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::clearCaller",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::stopProcess",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setupPolling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::flushCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearLastError",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::executeCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-3644"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-472"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-447",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-447"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::self",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
+   "return_type" : "type-3638",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::process",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-491",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::shutdown",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::transact",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::sendReply",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3638"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
    "function_name" : "android::hardware::readFromParcel",
    "linker_set_key" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE",
    "parameters" :
@@ -10769,6 +14105,24 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::release_object",
+   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3622"
+    },
+    {
+     "referenced_type" : "type-3772"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::interfacesEqual",
    "linker_set_key" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_",
    "parameters" :
@@ -10811,6 +14165,143 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
+   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
+   "return_type" : "type-2508",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::print",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2507"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::addPostCommandTask",
    "linker_set_key" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE",
    "parameters" :
@@ -11200,6 +14691,934 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::Parcel::writeFloat",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-298"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-447"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-199"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::finishWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeDouble",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-4"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeObject",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3772"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-4082" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-132"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-21"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::restartWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeCString",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInplace",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::writePointer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::continueWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-343"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-350"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3769"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUnpadded",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::acquireObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::freeDataNoInit",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::releaseObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataCapacity",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeWeakBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-3753"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeStrongBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2353"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2351"
+    },
+    {
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
+   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::incrementNumReferences",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
+   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::write",
+   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::remove",
+   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1030"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::freeData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::growData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setError",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::initState",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBool",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "referenced_type" : "type-550"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2347"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::fromStatusT",
    "linker_set_key" : "_ZN7android8hardware6Status11fromStatusTEi",
    "parameters" :
@@ -11366,6 +15785,133 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2487"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2487"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-2332",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-2335",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2329"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::TaskRunner::push",
    "linker_set_key" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE",
    "parameters" :
@@ -12055,6 +16601,341 @@
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::onTransact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2793"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-2358"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-2332",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-2360"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-949"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-2363",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-2355"
+    },
+    {
+     "referenced_type" : "type-2347"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2794"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2332"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2476"
+    },
+    {
+     "referenced_type" : "type-3888"
+    }
+   ],
+   "return_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2476"
+    },
+    {
+     "referenced_type" : "type-3887"
+    }
+   ],
+   "return_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::operator<<",
    "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE",
    "parameters" :
@@ -12085,6 +16966,38 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::BpHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2373"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2426"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::hidl_handle::getNativeHandle",
    "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv",
    "parameters" :
@@ -12176,6 +17089,1265 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::isContextManager",
+   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3847"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isServingCall",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3641"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
+   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2511"
+    }
+   ],
+   "return_type" : "type-2471",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::clearCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::errorCheck",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::findBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3779"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3778"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-3782",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-4083" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3775"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-2350"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-21",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::scanForFds",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcDataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readCString",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-139",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::updateCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataCapacity",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::objectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-352"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3780"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-342",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcBufferSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3783"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3779"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readWeakBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-2382",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::quickFindBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::enforceInterface",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-99"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-482"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-71",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::verifyBufferObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3787"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16Inplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-343",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferChild",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferParent",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3783"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3779"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3784"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3784"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-482"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3783"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3784"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3784"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-3784"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::data",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1030",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::read",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-245"
+    },
+    {
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::print",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-2476"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcData",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::objects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-2353",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3779"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3773"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataAvail",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-1",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3777"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-298",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3774"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-521"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-3776"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    }
+   ],
+   "return_type" : "type-447",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3766"
+    },
+    {
+     "referenced_type" : "type-291"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::description",
    "linker_set_key" : "_ZNK7android8hardware6Status11descriptionEv",
    "parameters" :
@@ -12189,6 +18361,22 @@
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::IBinder::checkSubclass",
+   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2331"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::return_status::assertOk",
    "linker_set_key" : "_ZNK7android8hardware7details13return_status8assertOkEv",
    "parameters" :
@@ -12200,6 +18388,213 @@
    ],
    "return_type" : "type-106",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2362"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-245",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2335"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2369"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-139"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::getHWBinderKernelReferences",
+   "linker_set_key" : "getHWBinderKernelReferences",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "return_type" : "type-19",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printHexData",
+   "linker_set_key" : "printHexData",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    },
+    {
+     "referenced_type" : "type-139"
+    },
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-19"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2542"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printTypeCode",
+   "linker_set_key" : "printTypeCode",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-1"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2542"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "return_type" : "type-106",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::stringForIndent",
+   "linker_set_key" : "stringForIndent",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-19"
+    }
+   ],
+   "return_type" : "type-99",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "global_vars" :
@@ -12265,6 +18660,36 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
+   "name" : "android::hardware::gTextBuffers",
+   "referenced_type" : "type-2514",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
+   "name" : "android::hardware::gProcessMutex",
+   "referenced_type" : "type-440",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aerrE",
+   "name" : "android::hardware::aerr",
+   "referenced_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4alogE",
+   "name" : "android::hardware::alog",
+   "referenced_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aoutE",
+   "name" : "android::hardware::aout",
+   "referenced_type" : "type-2476",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
    "referenced_type" : "type-703",
@@ -12281,6 +18706,12 @@
    "name" : "android::hardware::details::gBnMap",
    "referenced_type" : "type-412",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware8gProcessE",
+   "name" : "android::hardware::gProcess",
+   "referenced_type" : "type-2795",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
   }
  ],
  "lvalue_reference_types" :
@@ -12305,6 +18736,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const &",
+   "name" : "android::RefBase *const &",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3634",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const &",
+   "name" : "android::RefBase::weakref_type *const &",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3630",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
    "referenced_type" : "type-342",
@@ -12323,6 +18772,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const &",
+   "name" : "android::hardware::BHwBinder *const &",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "referenced_type" : "type-29",
@@ -12359,6 +18817,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump &",
+   "name" : "android::hardware::HexDump &",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
    "referenced_type" : "type-1376",
@@ -12370,8 +18837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12386,6 +18853,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel &",
+   "name" : "android::hardware::Parcel &",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
+   "name" : "android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-3833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "referenced_type" : "type-807",
@@ -12476,6 +18961,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2428",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2476",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3483",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3843",
+   "self_type" : "type-3842",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "referenced_type" : "type-1009",
@@ -12620,6 +19159,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3807",
+   "self_type" : "type-3819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
+   "name" : "android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-472",
+   "self_type" : "type-3635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
    "referenced_type" : "type-71",
@@ -12629,6 +19204,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
+   "name" : "android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-491",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
    "referenced_type" : "type-789",
@@ -12710,6 +19294,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-944",
+   "self_type" : "type-2404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
+   "name" : "android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-3757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "referenced_type" : "type-32",
@@ -12719,6 +19321,258 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "char *const &",
+   "name" : "char *const &",
+   "referenced_type" : "type-3790",
+   "self_type" : "type-3791",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[10]",
+   "name" : "char const (&)[10]",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[11]",
+   "name" : "char const (&)[11]",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3680",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[12]",
+   "name" : "char const (&)[12]",
+   "referenced_type" : "type-3652",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[13]",
+   "name" : "char const (&)[13]",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3651",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[14]",
+   "name" : "char const (&)[14]",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[15]",
+   "name" : "char const (&)[15]",
+   "referenced_type" : "type-3795",
+   "self_type" : "type-3797",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[16]",
+   "name" : "char const (&)[16]",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3682",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[17]",
+   "name" : "char const (&)[17]",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3702",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[18]",
+   "name" : "char const (&)[18]",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3686",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[19]",
+   "name" : "char const (&)[19]",
+   "referenced_type" : "type-3716",
+   "self_type" : "type-3718",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[20]",
+   "name" : "char const (&)[20]",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3696",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[22]",
+   "name" : "char const (&)[22]",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3722",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[25]",
+   "name" : "char const (&)[25]",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3711",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[28]",
+   "name" : "char const (&)[28]",
+   "referenced_type" : "type-3732",
+   "self_type" : "type-3734",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[29]",
+   "name" : "char const (&)[29]",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3708",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[2]",
+   "name" : "char const (&)[2]",
+   "referenced_type" : "type-3659",
+   "self_type" : "type-3661",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[31]",
+   "name" : "char const (&)[31]",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3693",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[32]",
+   "name" : "char const (&)[32]",
+   "referenced_type" : "type-3723",
+   "self_type" : "type-3725",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[35]",
+   "name" : "char const (&)[35]",
+   "referenced_type" : "type-3712",
+   "self_type" : "type-3714",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[37]",
+   "name" : "char const (&)[37]",
+   "referenced_type" : "type-3703",
+   "self_type" : "type-3705",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[3]",
+   "name" : "char const (&)[3]",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3674",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[4]",
+   "name" : "char const (&)[4]",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3794",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[5]",
+   "name" : "char const (&)[5]",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[6]",
+   "name" : "char const (&)[6]",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3665",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[7]",
+   "name" : "char const (&)[7]",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[8]",
+   "name" : "char const (&)[8]",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3677",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[9]",
+   "name" : "char const (&)[9]",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3668",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
    "referenced_type" : "type-348",
@@ -12737,6 +19591,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
+   "name" : "const android::hardware::BpHwBinder::Obituary &",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2415",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump &",
+   "name" : "const android::hardware::HexDump &",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-3888",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
    "referenced_type" : "type-1038",
@@ -12793,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1966",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12802,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2078",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2050",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12811,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12820,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -12829,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12838,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -12847,8 +19728,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2355",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2571",
+   "self_type" : "type-2573",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12856,6 +19746,60 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3103",
+   "self_type" : "type-3105",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3186",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3252",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3308",
+   "self_type" : "type-3310",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3353",
+   "self_type" : "type-3355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3409",
+   "self_type" : "type-3411",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
    "referenced_type" : "type-368",
    "self_type" : "type-370",
    "size" : 4,
@@ -12863,6 +19807,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3915",
+   "self_type" : "type-3917",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
+   "name" : "const android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
    "referenced_type" : "type-506",
@@ -12890,6 +19852,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode &",
+   "name" : "const android::hardware::TypeCode &",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-3887",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
    "referenced_type" : "type-1050",
@@ -12946,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13016,6 +19987,105 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3808",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
+   "name" : "const android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2498",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2358",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3469",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2526",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2540",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3587",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3594",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
    "referenced_type" : "type-70",
@@ -13025,6 +20095,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
+   "name" : "const android::sp<android::hardware::IInterface> &",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "referenced_type" : "type-765",
@@ -13034,6 +20113,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
+   "name" : "const android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-496",
+   "self_type" : "type-3622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "referenced_type" : "type-950",
@@ -13115,6 +20203,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2360",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
    "referenced_type" : "type-1367",
@@ -13126,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2570",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13142,6 +20239,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3752",
+   "self_type" : "type-3753",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3914",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "referenced_type" : "type-464",
@@ -13169,6 +20284,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const char &",
+   "name" : "const char &",
+   "referenced_type" : "type-100",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *const &",
+   "name" : "const char *const &",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-3",
@@ -13178,6 +20311,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object &",
+   "name" : "const flat_binder_object &",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
    "referenced_type" : "type-665",
@@ -13267,113 +20409,162 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1695",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1735",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1799",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1832",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1976",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1941",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2053",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2026",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2216",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2262",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2313",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2554",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2658",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2496",
-   "self_type" : "type-2498",
+   "referenced_type" : "type-2726",
+   "self_type" : "type-2728",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2571",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2839",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2877",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2933",
+   "self_type" : "type-2936",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2944",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3012",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3084",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3163",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3228",
+   "self_type" : "type-3230",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -13386,6 +20577,62 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3285",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3335",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3346",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3390",
+   "self_type" : "type-3392",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3434",
+   "self_type" : "type-3436",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3896",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4004",
+   "self_type" : "type-4006",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4079",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
    "referenced_type" : "type-515",
    "self_type" : "type-517",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -13569,17 +20816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1708",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13587,8 +20825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -13596,8 +20834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13605,8 +20843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2077",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2070",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13614,6 +20852,15 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2037",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "referenced_type" : "type-206",
    "self_type" : "type-214",
    "size" : 4,
@@ -13623,8 +20870,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2096",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13632,17 +20879,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2086",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2129",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13650,8 +20888,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13659,26 +20897,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2199",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2252",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -13686,8 +20906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2601",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13695,8 +20915,143 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2510",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2668",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2744",
+   "self_type" : "type-2746",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2816",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2882",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2963",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3111",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3151",
+   "self_type" : "type-3185",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3172",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3189",
+   "self_type" : "type-3194",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3239",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3294",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3301",
+   "self_type" : "type-3307",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3408",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3942",
+   "self_type" : "type-3944",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-4016",
+   "self_type" : "type-4018",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13758,8 +21113,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2738",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13785,8 +21149,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2594",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
+   "name" : "const std::function<sp<IBinder> (void *)> &",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13812,8 +21185,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2310",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13828,10 +21201,46 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3644",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3765",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1806",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2951",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13947,8 +21356,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13956,8 +21365,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1740",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13965,8 +21374,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1849",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13974,8 +21383,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13983,8 +21392,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13992,8 +21401,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14001,8 +21410,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14010,8 +21419,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14028,17 +21437,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2148",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14055,6 +21455,15 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "referenced_type" : "type-219",
    "self_type" : "type-218",
    "size" : 4,
@@ -14064,8 +21473,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14073,8 +21482,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14082,8 +21491,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14091,8 +21500,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14100,8 +21509,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2690",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14109,8 +21518,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14118,8 +21527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14127,8 +21536,143 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2993",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3005",
+   "self_type" : "type-3004",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3026",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3198",
+   "self_type" : "type-3197",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3314",
+   "self_type" : "type-3313",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3368",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3405",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3426",
+   "self_type" : "type-3425",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3440",
+   "self_type" : "type-3439",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14145,6 +21689,24 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3928",
+   "self_type" : "type-3927",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4041",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "referenced_type" : "type-568",
    "self_type" : "type-567",
    "size" : 4,
@@ -14233,6 +21795,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned char *const &",
+   "name" : "const unsigned char *const &",
+   "referenced_type" : "type-3727",
+   "self_type" : "type-3728",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
    "referenced_type" : "type-246",
@@ -14242,6 +21813,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *const &",
+   "name" : "const unsigned int *const &",
+   "referenced_type" : "type-3729",
+   "self_type" : "type-3731",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
    "referenced_type" : "type-661",
@@ -14260,6 +21840,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void *const &",
+   "name" : "const void *const &",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-19",
@@ -14289,8 +21878,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14298,17 +21887,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2210",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14316,6 +21896,15 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2492",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
    "referenced_type" : "type-265",
    "self_type" : "type-264",
    "size" : 4,
@@ -14325,6 +21914,78 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2892",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3318",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3803",
+   "self_type" : "type-3802",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3879",
+   "self_type" : "type-3878",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
    "referenced_type" : "type-822",
    "self_type" : "type-821",
    "size" : 4,
@@ -14338,6 +21999,15 @@
    "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *const &",
+   "name" : "void *const &",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3670",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   }
  ],
  "pointer_types" :
@@ -14371,6 +22041,78 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2437",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3636",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3788",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3883",
+   "self_type" : "type-3882",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-433",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
    "referenced_type" : "type-436",
@@ -14425,6 +22167,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase **",
+   "name" : "android::RefBase **",
+   "referenced_type" : "type-68",
+   "self_type" : "type-3606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const *",
+   "name" : "android::RefBase *const *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3612",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-1100",
@@ -14490,8 +22250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14499,8 +22259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14508,8 +22268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1763",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1728",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14517,8 +22277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14526,8 +22286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14535,8 +22295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1934",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14544,8 +22304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2051",
-   "self_type" : "type-2050",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14553,8 +22313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14562,8 +22322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14571,8 +22331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14580,8 +22340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14589,8 +22349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14598,8 +22358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2325",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14607,8 +22367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14616,8 +22376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14625,8 +22385,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14643,6 +22439,69 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2872",
+   "self_type" : "type-2871",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2938",
+   "self_type" : "type-2937",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3079",
+   "self_type" : "type-3078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3159",
+   "self_type" : "type-3158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-321",
    "self_type" : "type-320",
    "size" : 4,
@@ -14652,6 +22511,168 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3388",
+   "self_type" : "type-3387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3432",
+   "self_type" : "type-3431",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3619",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4002",
+   "self_type" : "type-4001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4074",
+   "self_type" : "type-4073",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-511",
    "self_type" : "type-510",
    "size" : 4,
@@ -14749,6 +22770,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type **",
+   "name" : "android::RefBase::weakref_type **",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3605",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const *",
+   "name" : "android::RefBase::weakref_type *const *",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
    "referenced_type" : "type-9",
@@ -14767,6 +22806,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
    "referenced_type" : "type-342",
@@ -14794,6 +22851,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase *> *",
+   "name" : "android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-432",
+   "self_type" : "type-3631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-431",
+   "self_type" : "type-3627",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Vector<android::String8> *",
    "name" : "android::Vector<android::String8> *",
    "referenced_type" : "type-252",
@@ -14803,6 +22878,96 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-430",
+   "self_type" : "type-3623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2338",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3840",
+   "self_type" : "type-3839",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-428",
+   "self_type" : "type-3829",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
    "referenced_type" : "type-182",
@@ -14859,8 +23024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14868,8 +23033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14877,8 +23042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14886,8 +23051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14895,8 +23060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14904,8 +23069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14913,8 +23078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14922,8 +23087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14931,8 +23096,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2904",
+   "self_type" : "type-2903",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3030",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3203",
+   "self_type" : "type-3202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3323",
+   "self_type" : "type-3322",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3379",
+   "self_type" : "type-3378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14949,6 +23195,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-3926",
+   "self_type" : "type-3925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
    "referenced_type" : "type-782",
    "self_type" : "type-781",
    "size" : 4,
@@ -14974,6 +23229,132 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder **",
+   "name" : "android::hardware::BHwBinder **",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const *",
+   "name" : "android::hardware::BHwBinder *const *",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3608",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder *",
+   "name" : "android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2335",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
+   "name" : "android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2424",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwRefBase *",
+   "name" : "android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2369",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput *",
+   "name" : "android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2507",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3545",
+   "self_type" : "type-3544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3881",
+   "self_type" : "type-3880",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2508",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "referenced_type" : "type-29",
@@ -15028,6 +23409,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump *",
+   "name" : "android::hardware::HexDump *",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2487",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::HidlMemory *",
    "name" : "android::hardware::HidlMemory *",
    "referenced_type" : "type-159",
@@ -15102,8 +23492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15111,8 +23501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15120,8 +23510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15129,8 +23519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1924",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15138,8 +23528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15147,8 +23537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15156,8 +23546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15165,8 +23555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15174,8 +23564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15183,8 +23573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15192,8 +23582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15201,8 +23591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15210,8 +23600,134 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2696",
+   "self_type" : "type-2695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2759",
+   "self_type" : "type-2758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2997",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3033",
+   "self_type" : "type-3032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3146",
+   "self_type" : "type-3145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3263",
+   "self_type" : "type-3262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3443",
+   "self_type" : "type-3442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15327,8 +23843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15336,8 +23852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15345,8 +23861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15354,8 +23870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15363,8 +23879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15372,8 +23888,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2380",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3196",
+   "self_type" : "type-3195",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3317",
+   "self_type" : "type-3316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3321",
+   "self_type" : "type-3320",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3429",
+   "self_type" : "type-3428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15426,8 +24005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15435,8 +24014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2040",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15444,8 +24023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2067",
+   "self_type" : "type-2066",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15453,8 +24032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15462,8 +24041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15471,8 +24050,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3053",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3148",
+   "self_type" : "type-3147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3330",
+   "self_type" : "type-3329",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3384",
+   "self_type" : "type-3383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15487,6 +24129,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::IPCThreadState *",
+   "name" : "android::hardware::IPCThreadState *",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
    "referenced_type" : "type-530",
@@ -15552,8 +24203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15561,8 +24212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15570,8 +24221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15579,8 +24230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15588,8 +24239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15597,8 +24248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15606,8 +24257,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2574",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15615,6 +24275,60 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3109",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3312",
+   "self_type" : "type-3311",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3357",
+   "self_type" : "type-3356",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3413",
+   "self_type" : "type-3412",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
    "referenced_type" : "type-372",
    "self_type" : "type-371",
    "size" : 4,
@@ -15622,10 +24336,28 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PassthroughServiceManager *",
+   "name" : "android::hardware::PassthroughServiceManager *",
+   "referenced_type" : "type-2897",
+   "self_type" : "type-2896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15640,6 +24372,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::PoolThread *",
+   "name" : "android::hardware::PoolThread *",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
    "referenced_type" : "type-1091",
@@ -15687,8 +24428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15696,8 +24437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15705,8 +24446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2041",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15714,8 +24455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15723,8 +24464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2159",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15732,8 +24473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15741,8 +24482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15750,8 +24491,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3000",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3056",
+   "self_type" : "type-3055",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3150",
+   "self_type" : "type-3149",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15784,6 +24606,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
+   "name" : "android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-3809",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "referenced_type" : "type-807",
@@ -15874,6 +24705,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2481",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput *",
+   "name" : "android::hardware::TextOutput *",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-3886",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
+   "name" : "android::hardware::TextOutput::Bundle *",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TypeCode *",
+   "name" : "android::hardware::TypeCode *",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
    "referenced_type" : "type-1514",
@@ -15885,8 +24752,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2558",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2712",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
+   "name" : "android::hardware::details::ClientCounterCallback *",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15966,8 +24842,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-2908",
+   "self_type" : "type-2907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16173,8 +25058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16378,6 +25263,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3807",
+   "self_type" : "type-3811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Thread> *",
+   "name" : "android::sp<android::Thread> *",
+   "referenced_type" : "type-499",
+   "self_type" : "type-3823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
    "referenced_type" : "type-472",
@@ -16387,6 +25299,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> *",
    "name" : "android::sp<android::hardware::HidlMemory> *",
    "referenced_type" : "type-157",
@@ -16540,6 +25461,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
+   "name" : "android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-361",
@@ -16567,6 +25497,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2432",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-3779",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-48",
@@ -16585,6 +25533,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
    "referenced_type" : "type-333",
@@ -16603,6 +25569,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-3827",
+   "self_type" : "type-3828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
    "referenced_type" : "type-348",
@@ -16621,6 +25605,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase *> *",
+   "name" : "const android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3633",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
    "referenced_type" : "type-254",
@@ -16630,6 +25632,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
    "referenced_type" : "type-249",
@@ -16639,6 +25686,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BHwBinder *",
+   "name" : "const android::hardware::BHwBinder *",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2362",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder *",
+   "name" : "const android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2373",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
+   "name" : "const android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2426",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2371",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
+   "name" : "const android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "referenced_type" : "type-1051",
@@ -16684,6 +25785,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump *",
+   "name" : "const android::hardware::HexDump *",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2490",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
    "referenced_type" : "type-1443",
@@ -16695,8 +25805,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-2477",
-   "self_type" : "type-2479",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2331",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2645",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16711,6 +25839,60 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
+   "name" : "const android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2421",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IInterface *",
+   "name" : "const android::hardware::IInterface *",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2553",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IPCThreadState *",
+   "name" : "const android::hardware::IPCThreadState *",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3641",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel *",
+   "name" : "const android::hardware::Parcel *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-3766",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState *",
+   "name" : "const android::hardware::ProcessState *",
+   "referenced_type" : "type-3846",
+   "self_type" : "type-3847",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
+   "name" : "const android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "referenced_type" : "type-811",
@@ -16792,10 +25974,28 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode *",
+   "name" : "const android::hardware::TypeCode *",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1773",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16875,8 +26075,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16920,8 +26120,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17089,6 +26289,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::Thread> *",
+   "name" : "const android::sp<android::Thread> *",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
+   "name" : "const android::sp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3650",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2498",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory> *",
    "name" : "const android::sp<android::hardware::HidlMemory> *",
    "referenced_type" : "type-162",
@@ -17098,6 +26343,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2423",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
    "referenced_type" : "type-70",
@@ -17107,6 +26361,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
+   "name" : "const android::sp<android::hardware::IInterface> *",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
    "referenced_type" : "type-496",
@@ -17215,6 +26478,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
+   "name" : "const android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-3752",
+   "self_type" : "type-3759",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-464",
@@ -17233,6 +26514,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const binder_buffer_object *",
+   "name" : "const binder_buffer_object *",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3787",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
    "referenced_type" : "type-100",
@@ -17262,17 +26552,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2111",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const dirent *",
-   "name" : "const dirent *",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17287,6 +26568,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-3210",
+   "self_type" : "type-3219",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object *",
+   "name" : "const flat_binder_object *",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
    "referenced_type" : "type-624",
@@ -17314,6 +26622,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const native_handle **",
+   "name" : "const native_handle **",
+   "referenced_type" : "type-16",
+   "self_type" : "type-3784",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
    "referenced_type" : "type-604",
@@ -17323,6 +26640,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *",
+   "name" : "const unsigned int *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-3730",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const unsigned long long *",
+   "name" : "const unsigned long long *",
+   "referenced_type" : "type-661",
+   "self_type" : "type-2353",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
    "referenced_type" : "type-138",
@@ -17332,6 +26667,33 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void **",
+   "name" : "const void **",
+   "referenced_type" : "type-139",
+   "self_type" : "type-3783",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "double *",
+   "name" : "double *",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3778",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "float *",
+   "name" : "float *",
+   "referenced_type" : "type-298",
+   "self_type" : "type-3777",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
    "referenced_type" : "type-303",
@@ -17359,6 +26721,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long *",
+   "name" : "long long *",
+   "referenced_type" : "type-447",
+   "self_type" : "type-3776",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-18",
@@ -17368,6 +26739,42 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "short *",
+   "name" : "short *",
+   "referenced_type" : "type-2",
+   "self_type" : "type-3774",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-550",
+   "self_type" : "type-3773",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2494",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "referenced_type" : "type-1251",
@@ -17379,17 +26786,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2096",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17404,6 +26802,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-3282",
+   "self_type" : "type-3281",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
    "referenced_type" : "type-199",
@@ -17422,6 +26838,51 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "unsigned long long *",
+   "name" : "unsigned long long *",
+   "referenced_type" : "type-21",
+   "self_type" : "type-2350",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short *",
+   "name" : "unsigned short *",
+   "referenced_type" : "type-132",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(const void *, void *, void *)",
+   "name" : "void (*)(const void *, void *, void *)",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const char *)",
+   "name" : "void (*)(void *, const char *)",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2542",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
    "referenced_type" : "type-106",
@@ -17444,6 +26905,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase *const",
+   "name" : "android::RefBase *const",
+   "referenced_type" : "type-68",
+   "self_type" : "type-3611",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-1099",
@@ -17516,8 +26987,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17526,8 +26997,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17536,8 +27007,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1730",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17546,8 +27017,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17556,8 +27027,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17566,8 +27037,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17576,8 +27047,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2052",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17586,8 +27057,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17596,8 +27067,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17606,8 +27077,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17616,8 +27087,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17626,8 +27097,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17636,8 +27107,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17646,8 +27117,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17656,8 +27127,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2500",
+   "self_type" : "type-2502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17666,8 +27137,48 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2723",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17686,6 +27197,76 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2939",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-320",
    "self_type" : "type-322",
    "size" : 4,
@@ -17696,6 +27277,186 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3278",
+   "self_type" : "type-3280",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3343",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3387",
+   "self_type" : "type-3389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3433",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3446",
+   "self_type" : "type-3448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3569",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3619",
+   "self_type" : "type-3621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3754",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3877",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4001",
+   "self_type" : "type-4003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-510",
    "self_type" : "type-513",
    "size" : 4,
@@ -17794,6 +27555,316 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_type *const",
+   "name" : "android::RefBase::weakref_type *const",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::BHwBinder *const",
+   "name" : "android::hardware::BHwBinder *const",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-3607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2366",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "char *const",
+   "name" : "char *const",
+   "referenced_type" : "type-243",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[10]",
+   "name" : "char const[10]",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[11]",
+   "name" : "char const[11]",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3678",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[12]",
+   "name" : "char const[12]",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[13]",
+   "name" : "char const[13]",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3648",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[14]",
+   "name" : "char const[14]",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[15]",
+   "name" : "char const[15]",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[16]",
+   "name" : "char const[16]",
+   "referenced_type" : "type-47",
+   "self_type" : "type-3681",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[17]",
+   "name" : "char const[17]",
+   "referenced_type" : "type-3701",
+   "self_type" : "type-3700",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[18]",
+   "name" : "char const[18]",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[19]",
+   "name" : "char const[19]",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3716",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[20]",
+   "name" : "char const[20]",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[22]",
+   "name" : "char const[22]",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[25]",
+   "name" : "char const[25]",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3709",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[28]",
+   "name" : "char const[28]",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[29]",
+   "name" : "char const[29]",
+   "referenced_type" : "type-3707",
+   "self_type" : "type-3706",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[2]",
+   "name" : "char const[2]",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[31]",
+   "name" : "char const[31]",
+   "referenced_type" : "type-3692",
+   "self_type" : "type-3691",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[32]",
+   "name" : "char const[32]",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[35]",
+   "name" : "char const[35]",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[37]",
+   "name" : "char const[37]",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[3]",
+   "name" : "char const[3]",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3671",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[4]",
+   "name" : "char const[4]",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[5]",
+   "name" : "char const[5]",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[6]",
+   "name" : "char const[6]",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[7]",
+   "name" : "char const[7]",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3687",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[8]",
+   "name" : "char const[8]",
+   "referenced_type" : "type-3676",
+   "self_type" : "type-3675",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[9]",
+   "name" : "char const[9]",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::CallStack",
    "name" : "const android::CallStack",
    "referenced_type" : "type-256",
@@ -17804,6 +27875,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-433",
+   "self_type" : "type-3836",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2418",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
    "referenced_type" : "type-315",
@@ -17824,6 +27915,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3827",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2408",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
    "referenced_type" : "type-342",
@@ -17844,6 +27955,26 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase *>",
+   "name" : "const android::Vector<android::RefBase *>",
+   "referenced_type" : "type-432",
+   "self_type" : "type-3632",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
+   "name" : "const android::Vector<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-431",
+   "self_type" : "type-3628",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
    "referenced_type" : "type-252",
@@ -17854,6 +27985,56 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
+   "name" : "const android::Vector<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-430",
+   "self_type" : "type-3624",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2413",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-428",
+   "self_type" : "type-3831",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2520",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<int>",
+   "name" : "const android::Vector<int>",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-244",
@@ -17864,6 +28045,76 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BHwBinder",
+   "name" : "const android::hardware::BHwBinder",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2361",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder",
+   "name" : "const android::hardware::BpHwBinder",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2372",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
+   "name" : "const android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2391",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2425",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2398",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2370",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput",
+   "name" : "const android::hardware::BufferedTextOutput",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2510",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "referenced_type" : "type-29",
@@ -17914,6 +28165,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::HexDump",
+   "name" : "const android::hardware::HexDump",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2489",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
    "referenced_type" : "type-1444",
@@ -17926,8 +28187,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-2478",
-   "self_type" : "type-2477",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2330",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17944,6 +28225,36 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
+   "name" : "const android::hardware::IBinder::DeathRecipient",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2420",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IInterface",
+   "name" : "const android::hardware::IInterface",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2552",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IPCThreadState",
+   "name" : "const android::hardware::IPCThreadState",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-3639",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
    "referenced_type" : "type-1039",
@@ -18006,8 +28317,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1964",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18016,8 +28327,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -18026,8 +28337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -18036,8 +28347,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -18046,8 +28357,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18056,8 +28367,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -18066,8 +28377,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2354",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2571",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -18076,6 +28397,66 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3103",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3308",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3354",
+   "self_type" : "type-3353",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3410",
+   "self_type" : "type-3409",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
    "referenced_type" : "type-369",
    "self_type" : "type-368",
    "size" : 68,
@@ -18084,6 +28465,36 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3916",
+   "self_type" : "type-3915",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState",
+   "name" : "const android::hardware::ProcessState",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-3846",
+   "size" : 128,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
+   "name" : "const android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-3812",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "referenced_type" : "type-807",
@@ -18184,6 +28595,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::TypeCode",
+   "name" : "const android::hardware::TypeCode",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2484",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
    "referenced_type" : "type-37",
@@ -18196,8 +28617,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1771",
+   "size" : 52,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::Waiter",
+   "name" : "const android::hardware::details::Waiter",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2917",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18287,7 +28718,7 @@
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32>",
    "name" : "const android::hardware::hidl_array<unsigned char, 32>",
    "referenced_type" : "type-1012",
-   "self_type" : "type-2292",
+   "self_type" : "type-2268",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18337,7 +28768,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "referenced_type" : "type-1008",
-   "self_type" : "type-2293",
+   "self_type" : "type-2270",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18564,6 +28995,56 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3807",
+   "self_type" : "type-3806",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::Thread>",
+   "name" : "const android::sp<android::Thread>",
+   "referenced_type" : "type-499",
+   "self_type" : "type-3830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
+   "name" : "const android::sp<android::hardware::BHwBinder>",
+   "referenced_type" : "type-472",
+   "self_type" : "type-3640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
    "name" : "const android::sp<android::hardware::HidlMemory>",
    "referenced_type" : "type-157",
@@ -18572,6 +29053,64 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2356",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-962",
+   "self_type" : "type-2405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2524",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3592",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
@@ -18584,6 +29123,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
+   "name" : "const android::sp<android::hardware::IInterface>",
+   "referenced_type" : "type-968",
+   "self_type" : "type-2547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "referenced_type" : "type-766",
@@ -18712,6 +29261,16 @@
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-944",
+   "self_type" : "type-2359",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
@@ -18720,11 +29279,21 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-3752",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -18736,6 +29305,14 @@
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3912",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient>",
@@ -18756,6 +29333,16 @@
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const binder_buffer_object",
+   "name" : "const binder_buffer_object",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3785",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
@@ -18776,6 +29363,16 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const char *const",
+   "name" : "const char *const",
+   "referenced_type" : "type-99",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
@@ -18800,18 +29397,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
-   "size" : 280,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const dirent",
-   "name" : "const dirent",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18828,6 +29415,26 @@
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
+   "size" : 280,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-3326",
+   "self_type" : "type-3325",
+   "size" : 280,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-4",
@@ -18836,6 +29443,16 @@
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const flat_binder_object",
+   "name" : "const flat_binder_object",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const float",
@@ -18939,128 +29556,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1732",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2024",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2175",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2214",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2548",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2656",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2497",
-   "self_type" : "type-2496",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2572",
-   "self_type" : "type-2571",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2875",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2942",
+   "self_type" : "type-2941",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3011",
+   "self_type" : "type-3010",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3083",
+   "self_type" : "type-3082",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3284",
+   "self_type" : "type-3283",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19075,6 +29756,62 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
+   "referenced_type" : "type-3334",
+   "self_type" : "type-3333",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3345",
+   "self_type" : "type-3344",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3391",
+   "self_type" : "type-3390",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4004",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
    "referenced_type" : "type-516",
    "self_type" : "type-515",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -19270,8 +30007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1698",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19280,8 +30017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1737",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19290,8 +30027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19300,8 +30037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19310,8 +30047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1907",
-   "self_type" : "type-1906",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19320,8 +30057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19330,8 +30067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19340,8 +30077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2148",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19350,8 +30087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2221",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19360,8 +30097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19370,28 +30107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2295",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2332",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19410,8 +30127,138 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2505",
-   "self_type" : "type-2504",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2559",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2842",
+   "self_type" : "type-2841",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2881",
+   "self_type" : "type-2880",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2958",
+   "self_type" : "type-2957",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3101",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3236",
+   "self_type" : "type-3235",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3352",
+   "self_type" : "type-3351",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3401",
+   "self_type" : "type-3400",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19430,6 +30277,36 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3438",
+   "self_type" : "type-3437",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3902",
+   "self_type" : "type-3901",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4012",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "referenced_type" : "type-528",
    "self_type" : "type-527",
    "size" : 12,
@@ -19560,8 +30437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1750",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19570,8 +30447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19580,8 +30457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19590,8 +30467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19600,8 +30477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19610,8 +30487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2141",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19620,8 +30497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19630,8 +30507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19640,8 +30517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19650,8 +30527,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2527",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-2972",
+   "self_type" : "type-2971",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3025",
+   "self_type" : "type-3024",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3305",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-4035",
+   "self_type" : "type-4034",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19770,8 +30747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1711",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19780,8 +30757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19790,8 +30767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19800,8 +30777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2019",
-   "self_type" : "type-2018",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19810,8 +30787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19820,8 +30797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2139",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19830,8 +30807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19840,8 +30817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19850,8 +30827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19860,8 +30837,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2970",
+   "self_type" : "type-2969",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3022",
+   "self_type" : "type-3021",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3126",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3304",
+   "self_type" : "type-3303",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3421",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-4033",
+   "self_type" : "type-4032",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -20020,18 +31097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1706",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20040,8 +31107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -20050,8 +31117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20060,8 +31127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20070,8 +31137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20090,18 +31157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20110,8 +31167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20120,18 +31177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2229",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -20140,8 +31187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -20150,8 +31197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2599",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20160,8 +31207,158 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2508",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2666",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2744",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2814",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2879",
+   "self_type" : "type-2878",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3111",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3238",
+   "self_type" : "type-3237",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3301",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3359",
+   "self_type" : "type-3358",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -20230,8 +31427,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2809",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20260,8 +31467,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2595",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
+   "name" : "const std::function<sp<IBinder> (void *)>",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -20300,8 +31517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -20310,8 +31527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2578",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -20330,12 +31547,42 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3762",
+   "self_type" : "type-3761",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
    "referenced_type" : "type-377",
    "self_type" : "type-376",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
@@ -20390,8 +31637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20400,8 +31647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2029",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20410,8 +31657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2125",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20420,8 +31667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2146",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20430,8 +31677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20440,8 +31687,68 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3092",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3234",
+   "self_type" : "type-3233",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3396",
+   "self_type" : "type-3395",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20500,8 +31807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20510,8 +31817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2057",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2027",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20520,8 +31827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20530,8 +31837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20540,8 +31847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20550,18 +31857,98 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3087",
+   "self_type" : "type-3086",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3232",
+   "self_type" : "type-3231",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3286",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3394",
+   "self_type" : "type-3393",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> >",
+   "name" : "const std::vector<int, std::allocator<int> >",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -20690,8 +32077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20700,8 +32087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1741",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20710,8 +32097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20720,8 +32107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20730,8 +32117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20740,8 +32127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20750,8 +32137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20760,8 +32147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20780,18 +32167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20810,8 +32187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20830,8 +32207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2243",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20840,8 +32217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20850,8 +32227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20860,8 +32237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20870,8 +32247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2691",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20880,8 +32257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2755",
+   "self_type" : "type-2754",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20890,8 +32267,168 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-2826",
+   "self_type" : "type-2825",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2861",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2885",
+   "self_type" : "type-2884",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2995",
+   "self_type" : "type-2994",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3005",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3027",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3141",
+   "self_type" : "type-3140",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3199",
+   "self_type" : "type-3198",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3218",
+   "self_type" : "type-3217",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3315",
+   "self_type" : "type-3314",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3427",
+   "self_type" : "type-3426",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3440",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20910,6 +32447,26 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4043",
+   "self_type" : "type-4042",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "referenced_type" : "type-569",
    "self_type" : "type-568",
    "size" : 12,
@@ -21008,6 +32565,16 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned char *const",
+   "name" : "const unsigned char *const",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-3727",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
    "referenced_type" : "type-1",
@@ -21016,6 +32583,16 @@
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned int *const",
+   "name" : "const unsigned int *const",
+   "referenced_type" : "type-3730",
+   "self_type" : "type-3729",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
@@ -21044,6 +32621,26 @@
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const void *const",
+   "name" : "const void *const",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2386",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "void *const",
+   "name" : "void *const",
+   "referenced_type" : "type-245",
+   "self_type" : "type-3669",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 1,
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
@@ -21052,12 +32649,75 @@
    "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-19",
+   "self_type" : "type-2337",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
   }
  ],
  "record_types" :
  [
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-9"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-2504"
+    },
+    {
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-2505"
+    }
+   ],
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-2503",
+   "self_type" : "type-2503",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -21086,6 +32746,16 @@
    "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::CompileTimeAssert<true>",
+   "name" : "android::CompileTimeAssert<true>",
+   "referenced_type" : "type-3804",
+   "self_type" : "type-3804",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Debug.h",
+   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -21130,6 +32800,26 @@
    [
     {
      "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2342"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "field_name" : "mCount",
      "referenced_type" : "type-314"
     }
@@ -21470,6 +33160,64 @@
    "base_specifiers" :
    [
     {
+     "access" : "private",
+     "referenced_type" : "type-251"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2343" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "referenced_type" : "type-244"
     }
    ],
@@ -21949,6 +33697,61 @@
      "referenced_type" : "type-244"
     }
    ],
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
@@ -21997,6 +33800,116 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2518",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-244"
+    }
+   ],
+   "linker_set_key" : "android::Vector<int>",
+   "name" : "android::Vector<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2514",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android6VectorIiEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -22111,6 +34024,617 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3871",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342", "type-71" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2468",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-2334"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2328"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 64,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlive",
+     "field_offset" : 96,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObitsSent",
+     "field_offset" : 128,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObituaries",
+     "field_offset" : 160,
+     "referenced_type" : "type-2338"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 192,
+     "referenced_type" : "type-2340"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mConstantData",
+     "field_offset" : 352,
+     "referenced_type" : "type-2347"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDescriptorCache",
+     "field_offset" : 384,
+     "referenced_type" : "type-342"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder",
+   "name" : "android::hardware::BpHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 52,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "recipient",
+     "referenced_type" : "type-944"
+    },
+    {
+     "field_name" : "cookie",
+     "field_offset" : 64,
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 96,
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
+   "name" : "android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2374",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "referenced_type" : "type-2341"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
+   "name" : "android::hardware::BpHwBinder::ObjectManager",
+   "record_kind" : "class",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "object",
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "cleanupCookie",
+     "field_offset" : 32,
+     "referenced_type" : "type-245"
+    },
+    {
+     "field_name" : "func",
+     "field_offset" : 64,
+     "referenced_type" : "type-2345"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2344",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-2366"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-35"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-2368"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2365",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2474"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mFlags",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSeq",
+     "field_offset" : 64,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIndex",
+     "field_offset" : 96,
+     "referenced_type" : "type-624"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mGlobalState",
+     "field_offset" : 160,
+     "referenced_type" : "type-2471"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BufferedTextOutput",
+   "name" : "android::hardware::BufferedTextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2506",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
+    }
+   ]
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -22273,6 +34797,55 @@
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-139"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 32,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBytesPerLine",
+     "field_offset" : 64,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSingleLineCutoff",
+     "field_offset" : 96,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlignment",
+     "field_offset" : 128,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCArrayStyle",
+     "field_offset" : 160,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::HexDump",
+   "name" : "android::hardware::HexDump",
+   "record_kind" : "class",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2486",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
@@ -22366,6 +34939,426 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2379",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2375",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-496"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-430"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-431"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-432"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-431"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-2348"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-2348"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-99"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-472"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-2436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-2437"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-2433"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -22422,6 +35415,373 @@
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-2349"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-291"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-2350"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-2351"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-245"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-1"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-21"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-21"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2376",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-25"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-245"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-2440"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-2441"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-1"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-447"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-436"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-428"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-2432"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-245"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-433"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-221"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 808,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-2337"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 864,
+     "referenced_type" : "type-246"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 896,
+     "referenced_type" : "type-2433"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
+   "size" : 128,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 116,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2329"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-35"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -22687,6 +36047,89 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput",
+   "name" : "android::hardware::TextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTO",
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TextOutput::Bundle",
+   "name" : "android::hardware::TextOutput::Bundle",
+   "record_kind" : "class",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCode",
+     "referenced_type" : "type-1"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TypeCode",
+   "name" : "android::hardware::TypeCode",
+   "record_kind" : "class",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2482",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
@@ -24241,8 +37684,8 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE",
@@ -27917,6 +41360,52 @@
    "fields" :
    [
     {
+     "field_name" : "key",
+     "referenced_type" : "type-342"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-71"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3807",
+   "self_type" : "type-3807",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342", "type-71" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "key",
+     "referenced_type" : "type-139"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-2344"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139", "type-2344" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "m_ptr",
      "referenced_type" : "type-500"
@@ -27959,6 +41448,26 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
+     "referenced_type" : "type-2471"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2470",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2473" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
      "referenced_type" : "type-158"
     }
    ],
@@ -28274,6 +41783,270 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
+   "name" : "android::trait_pointer<android::RefBase *>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3747",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3746",
+   "self_type" : "type-3746",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::String16>",
+   "name" : "android::trait_pointer<android::String16>",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3865",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3745",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3863",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3864",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2460",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2530",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3866",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<const void *>",
+   "name" : "android::trait_pointer<const void *>",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2461",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<int>",
+   "name" : "android::trait_pointer<int>",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3884",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
+   "name" : "android::trait_trivial_copy<android::RefBase *>",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3741",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3740",
+   "self_type" : "type-3740",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
+   "name" : "android::trait_trivial_copy<android::String16>",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3857",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3737",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3856",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3859",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2528",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3858",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
    "referenced_type" : "type-191",
@@ -28296,6 +42069,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<const void *>",
+   "name" : "android::trait_trivial_copy<const void *>",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
    "referenced_type" : "type-529",
@@ -28428,6 +42212,127 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase *>",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3683",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3673",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
+   "name" : "android::trait_trivial_ctor<android::String16>",
+   "referenced_type" : "type-3850",
+   "self_type" : "type-3850",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3662",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3848",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3849",
+   "self_type" : "type-3849",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2469",
+   "self_type" : "type-2469",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3851",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
    "referenced_type" : "type-189",
@@ -28450,6 +42355,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
+   "name" : "android::trait_trivial_ctor<const void *>",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2445",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
    "referenced_type" : "type-522",
@@ -28582,6 +42498,127 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase *>",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3735",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3726",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
+   "name" : "android::trait_trivial_dtor<android::String16>",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3853",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3715",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2449",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3852",
+   "self_type" : "type-3852",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3855",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2527",
+   "self_type" : "type-2527",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3854",
+   "self_type" : "type-3854",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
    "referenced_type" : "type-190",
@@ -28604,6 +42641,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
+   "name" : "android::trait_trivial_dtor<const void *>",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
    "referenced_type" : "type-526",
@@ -28736,6 +42784,28 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
+   "name" : "android::trait_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3744",
+   "self_type" : "type-3744",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3743",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
    "referenced_type" : "type-353",
@@ -28758,6 +42828,94 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3742",
+   "self_type" : "type-3742",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3860",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3862",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2458",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3861",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
    "referenced_type" : "type-192",
@@ -28780,6 +42938,17 @@
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<const void *>",
+   "name" : "android::trait_trivial_move<const void *>",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
    "referenced_type" : "type-536",
@@ -28911,6 +43080,302 @@
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase *>",
+   "name" : "android::traits<android::RefBase *>",
+   "referenced_type" : "type-3750",
+   "self_type" : "type-3750",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
+   "name" : "android::traits<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3749",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::String16>",
+   "name" : "android::traits<android::String16>",
+   "referenced_type" : "type-3869",
+   "self_type" : "type-3869",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-342" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
+   "name" : "android::traits<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3748",
+   "self_type" : "type-3748",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2467",
+   "self_type" : "type-2467",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2344" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3867",
+   "self_type" : "type-3867",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3868",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2464",
+   "self_type" : "type-2464",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2531",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3870",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-71" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<const void *>",
+   "name" : "android::traits<const void *>",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-139" ],
+   "unique_id" : "_ZTSN7android6traitsIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<int>",
+   "name" : "android::traits<int>",
+   "referenced_type" : "type-3885",
+   "self_type" : "type-3885",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android6traitsIiEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3618"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
+   "name" : "android::use_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3617",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-68" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3616"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3615",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-35" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3614"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3613",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2332" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2396"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2374" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3816"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3815",
+   "self_type" : "type-3815",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2416" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3818"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3817",
+   "self_type" : "type-3817",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3807" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2394"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2384" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2533"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2532",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3873"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<int>",
+   "name" : "android::use_trivial_move<int>",
+   "referenced_type" : "type-3872",
+   "self_type" : "type-3872",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-19" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
@@ -28969,6 +43434,32 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
+     "referenced_type" : "type-2329"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-35"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::hardware::IBinder>",
+   "name" : "android::wp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-2328" ],
+   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
      "referenced_type" : "type-143"
     },
     {
@@ -29569,6 +44060,33 @@
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lock",
+     "referenced_type" : "type-2513"
+    },
+    {
+     "field_name" : "has_tls",
+     "field_offset" : 32,
+     "referenced_type" : "type-19"
+    },
+    {
+     "field_name" : "tls",
+     "field_offset" : 64,
+     "referenced_type" : "type-19"
+    }
+   ],
+   "linker_set_key" : "thread_store_t",
+   "name" : "thread_store_t",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
+   "size" : 12,
+   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
+   "unique_id" : "thread_store_t"
   }
  ],
  "rvalue_reference_types" :
@@ -29746,6 +44264,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-962",
+   "self_type" : "type-2422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
    "referenced_type" : "type-71",
@@ -29901,8 +44428,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2012",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29910,8 +44437,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29919,8 +44446,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29928,8 +44455,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29937,8 +44464,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29946,8 +44473,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2285",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3296",
+   "self_type" : "type-3295",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3363",
+   "self_type" : "type-3362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3416",
+   "self_type" : "type-3415",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30000,8 +44581,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30009,8 +44590,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30018,8 +44599,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30027,8 +44608,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30036,8 +44617,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30045,8 +44626,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2289",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3367",
+   "self_type" : "type-3366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3419",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30099,8 +44734,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2013",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30108,8 +44743,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2040",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30117,8 +44752,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30126,8 +44761,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30135,8 +44770,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -30144,8 +44779,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2287",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3298",
+   "self_type" : "type-3297",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3365",
+   "self_type" : "type-3364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3417",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/29/64/arm_armv8-a/source-based/libhwbinder.so.lsdump b/29/64/arm_armv8-a/source-based/libhwbinder.so.lsdump
index 780eb62..e1938ec 100644
--- a/29/64/arm_armv8-a/source-based/libhwbinder.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libhwbinder.so.lsdump
@@ -1,291 +1,5 @@
 {
- "array_types" :
- [
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-191",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [10]",
-   "name" : "char [10]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-648",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [11]",
-   "name" : "char [11]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-670",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [12]",
-   "name" : "char [12]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-645",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [13]",
-   "name" : "char [13]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-641",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [14]",
-   "name" : "char [14]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-689",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [15]",
-   "name" : "char [15]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-122",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-673",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [17]",
-   "name" : "char [17]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-692",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [18]",
-   "name" : "char [18]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-677",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [19]",
-   "name" : "char [19]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-708",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [20]",
-   "name" : "char [20]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-686",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [22]",
-   "name" : "char [22]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-711",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [25]",
-   "name" : "char [25]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-701",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [28]",
-   "name" : "char [28]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-724",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [29]",
-   "name" : "char [29]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-698",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [2]",
-   "name" : "char [2]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-651",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [31]",
-   "name" : "char [31]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-683",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-714",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [35]",
-   "name" : "char [35]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-704",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [37]",
-   "name" : "char [37]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-695",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [3]",
-   "name" : "char [3]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-663",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4]",
-   "name" : "char [4]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [5]",
-   "name" : "char [5]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-125",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [6]",
-   "name" : "char [6]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-655",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [7]",
-   "name" : "char [7]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-680",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [8]",
-   "name" : "char [8]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-667",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [9]",
-   "name" : "char [9]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-658",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-95",
-   "self_type" : "type-301",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-10",
-   "self_type" : "type-84",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-66",
-   "self_type" : "type-242",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-4",
-   "self_type" : "type-292",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
+ "array_types" : [],
  "builtin_types" :
  [
   {
@@ -294,8 +8,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1
   },
   {
@@ -304,43 +18,25 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 1
   },
   {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char16_t",
-   "name" : "char16_t",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
-   "size" : 2
-  },
-  {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-8",
+   "self_type" : "type-8",
    "size" : 8
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-7",
+   "self_type" : "type-7",
    "size" : 4
   },
   {
@@ -348,16 +44,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-3",
+   "self_type" : "type-3",
    "size" : 8
   },
   {
@@ -365,8 +61,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 8
   },
   {
@@ -374,27 +70,18 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 2
   },
   {
    "alignment" : 1,
    "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 1
   },
   {
@@ -403,8 +90,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4
   },
   {
@@ -413,8 +100,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -423,8 +110,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 8
   },
   {
@@ -433,16882 +120,46 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+   "name" : "__aeabi_memclr"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "__aeabi_memclr4"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+   "name" : "__aeabi_memclr8"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+   "name" : "__aeabi_memset"
   },
   {
-   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+   "name" : "__aeabi_memset4"
   },
   {
-   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel6removeEjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8growDataEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9initStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4dataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
-  },
-  {
-   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "getHWBinderKernelReferences"
-  },
-  {
-   "name" : "printHexData"
-  },
-  {
-   "name" : "printTypeCode"
-  },
-  {
-   "name" : "stringForIndent"
+   "name" : "__aeabi_memset8"
   }
  ],
- "elf_objects" :
- [
-  {
-   "name" : "_ZN7android8hardware12gTextBuffersE"
-  },
-  {
-   "name" : "_ZN7android8hardware13gProcessMutexE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aerrE"
-  },
-  {
-   "name" : "_ZN7android8hardware4alogE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aoutE"
-  },
-  {
-   "name" : "_ZN7android8hardware8gProcessE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10IInterfaceE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware12ProcessStateE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIiEE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10IInterfaceE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware10PoolThreadE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10TextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware12FdTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware12ProcessStateE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware13LogTextOutputE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String16::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String16::StaticLinkage",
-   "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
-   "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-10",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-293",
-   "self_type" : "type-293",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    }
-   ],
-   "referenced_type" : "type-512",
-   "return_type" : "type-508",
-   "self_type" : "type-512",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-200"
-    },
-    {
-     "referenced_type" : "type-159"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-199",
-   "return_type" : "type-38",
-   "self_type" : "type-199",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-305",
-   "return_type" : "type-10",
-   "self_type" : "type-305",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-520"
-    }
-   ],
-   "referenced_type" : "type-519",
-   "return_type" : "type-520",
-   "self_type" : "type-519",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-70",
-   "return_type" : "type-13",
-   "self_type" : "type-70",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (const void *, void *, void *)",
-   "name" : "void (const void *, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-336",
-   "return_type" : "type-13",
-   "self_type" : "type-336",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-203"
-    }
-   ],
-   "referenced_type" : "type-576",
-   "return_type" : "type-13",
-   "self_type" : "type-576",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-471"
-    },
-    {
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-192",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-586"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-586"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-406"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-48",
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-435"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-578",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::sendObituary",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-457"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-445"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-746"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-589"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-582"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-585"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-266"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-266"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-266"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-266"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
-   "return_type" : "type-193",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMaxThreads",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::startThreadPool",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-200"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-193",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-159"
-    },
-    {
-     "referenced_type" : "type-200"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-140",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setCallRestriction",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-206"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getKernelReferences",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::becomeContextManager",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-198"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-202",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-32",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::self",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
-   "return_type" : "type-193",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-194"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
-   "return_type" : "type-629",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::clearCaller",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::stopProcess",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setupPolling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-633"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::flushCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearLastError",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::executeCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-633"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-636"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-466"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-93",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-633"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::self",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
-   "return_type" : "type-629",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::process",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-193",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::shutdown",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::transact",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::sendReply",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-629"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::release_object",
-   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-608"
-    },
-    {
-     "referenced_type" : "type-81"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
-   "return_type" : "type-536",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::print",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "referenced_type" : "type-203"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-535"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeFloat",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-95"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::finishWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeDouble",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeObject",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-81"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-747" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-91"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-68"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::restartWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeCString",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-203"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInplace",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::writePointer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::continueWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-136"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-200"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-78"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUnpadded",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::acquireObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::freeDataNoInit",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::releaseObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataCapacity",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeWeakBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-44"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeStrongBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-159"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-203"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
-   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::incrementNumReferences",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
-   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::write",
-   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::remove",
-   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::freeData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::growData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setError",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::initState",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBool",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-87"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-516"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-516"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-8",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-578",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::onTransact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-748"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-8",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-335"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-130",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-730"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-749"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "referenced_type" : "type-272"
-    }
-   ],
-   "return_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "referenced_type" : "type-269"
-    }
-   ],
-   "return_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-337"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-459"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::isContextManager",
-   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-212"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-203",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isServingCall",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-632"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
-   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-540"
-    }
-   ],
-   "return_type" : "type-503",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::clearCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::errorCheck",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::findBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-98"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-96"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-97",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-751" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-67"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-68",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::scanForFds",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcDataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readCString",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-203",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-103",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::updateCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataCapacity",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::objectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-562"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-135",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcBufferSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readWeakBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-32",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::quickFindBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::enforceInterface",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-203"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-586"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::verifyBufferObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-108"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16Inplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-136",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferChild",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferParent",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-586"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    },
-    {
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::data",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::read",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::print",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-508"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcData",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::objects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-74",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-86"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataAvail",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-94"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-95",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-633"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-92"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-93",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-65"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::checkSubclass",
-   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-568"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-127"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-578"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-155"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::getHWBinderKernelReferences",
-   "linker_set_key" : "getHWBinderKernelReferences",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-572"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printHexData",
-   "linker_set_key" : "printHexData",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-10"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printTypeCode",
-   "linker_set_key" : "printTypeCode",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-577"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::stringForIndent",
-   "linker_set_key" : "stringForIndent",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-203",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "global_vars" :
- [
-  {
-   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
-   "name" : "android::hardware::gTextBuffers",
-   "referenced_type" : "type-543",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
-   "name" : "android::hardware::gProcessMutex",
-   "referenced_type" : "type-312",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aerrE",
-   "name" : "android::hardware::aerr",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4alogE",
-   "name" : "android::hardware::alog",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aoutE",
-   "name" : "android::hardware::aout",
-   "referenced_type" : "type-508",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware8gProcessE",
-   "name" : "android::hardware::gProcess",
-   "referenced_type" : "type-752",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  }
- ],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-312",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-316",
-   "self_type" : "type-320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const &",
-   "name" : "android::RefBase *const &",
-   "referenced_type" : "type-597",
-   "self_type" : "type-620",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const &",
-   "name" : "android::RefBase::weakref_type *const &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-616",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 &",
-   "name" : "android::String16 &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-555",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-202",
-   "self_type" : "type-489",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const &",
-   "name" : "android::hardware::BHwBinder *const &",
-   "referenced_type" : "type-593",
-   "self_type" : "type-612",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump &",
-   "name" : "android::hardware::HexDump &",
-   "referenced_type" : "type-274",
-   "self_type" : "type-517",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
-   "name" : "android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-141",
-   "self_type" : "type-179",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1033",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-208",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-267",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-462",
-   "self_type" : "type-461",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-134",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-408",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
-   "name" : "android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-466",
-   "self_type" : "type-626",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-502",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &",
-   "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
-   "name" : "android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-193",
-   "self_type" : "type-192",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-431",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
-   "name" : "android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *const &",
-   "name" : "char *const &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[10]",
-   "name" : "char const (&)[10]",
-   "referenced_type" : "type-647",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[11]",
-   "name" : "char const (&)[11]",
-   "referenced_type" : "type-669",
-   "self_type" : "type-671",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[12]",
-   "name" : "char const (&)[12]",
-   "referenced_type" : "type-644",
-   "self_type" : "type-646",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[13]",
-   "name" : "char const (&)[13]",
-   "referenced_type" : "type-640",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[14]",
-   "name" : "char const (&)[14]",
-   "referenced_type" : "type-688",
-   "self_type" : "type-690",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[15]",
-   "name" : "char const (&)[15]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[16]",
-   "name" : "char const (&)[16]",
-   "referenced_type" : "type-672",
-   "self_type" : "type-674",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[17]",
-   "name" : "char const (&)[17]",
-   "referenced_type" : "type-691",
-   "self_type" : "type-693",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[18]",
-   "name" : "char const (&)[18]",
-   "referenced_type" : "type-676",
-   "self_type" : "type-678",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[19]",
-   "name" : "char const (&)[19]",
-   "referenced_type" : "type-707",
-   "self_type" : "type-709",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[20]",
-   "name" : "char const (&)[20]",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[22]",
-   "name" : "char const (&)[22]",
-   "referenced_type" : "type-710",
-   "self_type" : "type-712",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[25]",
-   "name" : "char const (&)[25]",
-   "referenced_type" : "type-700",
-   "self_type" : "type-702",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[28]",
-   "name" : "char const (&)[28]",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[29]",
-   "name" : "char const (&)[29]",
-   "referenced_type" : "type-697",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[2]",
-   "name" : "char const (&)[2]",
-   "referenced_type" : "type-650",
-   "self_type" : "type-652",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[31]",
-   "name" : "char const (&)[31]",
-   "referenced_type" : "type-682",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[32]",
-   "name" : "char const (&)[32]",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[35]",
-   "name" : "char const (&)[35]",
-   "referenced_type" : "type-703",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[37]",
-   "name" : "char const (&)[37]",
-   "referenced_type" : "type-694",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[3]",
-   "name" : "char const (&)[3]",
-   "referenced_type" : "type-662",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[4]",
-   "name" : "char const (&)[4]",
-   "referenced_type" : "type-118",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[5]",
-   "name" : "char const (&)[5]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[6]",
-   "name" : "char const (&)[6]",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[7]",
-   "name" : "char const (&)[7]",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[8]",
-   "name" : "char const (&)[8]",
-   "referenced_type" : "type-666",
-   "self_type" : "type-668",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[9]",
-   "name" : "char const (&)[9]",
-   "referenced_type" : "type-657",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-201",
-   "self_type" : "type-200",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-463",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
-   "name" : "const android::hardware::BpHwBinder::Obituary &",
-   "referenced_type" : "type-415",
-   "self_type" : "type-445",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "referenced_type" : "type-422",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump &",
-   "name" : "const android::hardware::HexDump &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-62",
-   "self_type" : "type-730",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
-   "name" : "const android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-143",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode &",
-   "name" : "const android::hardware::TypeCode &",
-   "referenced_type" : "type-270",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-133",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
-   "name" : "const android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-631",
-   "self_type" : "type-639",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-433",
-   "self_type" : "type-435",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-5",
-   "self_type" : "type-30",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-753",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-821",
-   "self_type" : "type-823",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1090",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1102",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-553",
-   "self_type" : "type-556",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-573",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-859",
-   "self_type" : "type-861",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-865",
-   "self_type" : "type-867",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
-   "name" : "const android::sp<android::hardware::IInterface> &",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
-   "name" : "const android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-465",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-398",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char &",
-   "name" : "const char &",
-   "referenced_type" : "type-204",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const &",
-   "name" : "const char *const &",
-   "referenced_type" : "type-510",
-   "self_type" : "type-511",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-350",
-   "self_type" : "type-424",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-776",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-910",
-   "self_type" : "type-912",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-309",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-566",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-248",
-   "self_type" : "type-251",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-249",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-399",
-   "self_type" : "type-400",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1159",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-634",
-   "self_type" : "type-636",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-884",
-   "self_type" : "type-887",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-76",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-773",
-   "self_type" : "type-775",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-907",
-   "self_type" : "type-909",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-401",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *const &",
-   "name" : "const unsigned char *const &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-719",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-56",
-   "self_type" : "type-55",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *const &",
-   "name" : "const unsigned int *const &",
-   "referenced_type" : "type-720",
-   "self_type" : "type-722",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-299",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *const &",
-   "name" : "const void *const &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-411",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int &",
-   "name" : "int &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-547",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1060",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-255",
-   "self_type" : "type-254",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-729",
-   "self_type" : "type-728",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-812",
-   "self_type" : "type-811",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-850",
-   "self_type" : "type-849",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-976",
-   "self_type" : "type-975",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *const &",
-   "name" : "void *const &",
-   "referenced_type" : "type-660",
-   "self_type" : "type-661",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-731",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-735",
-   "self_type" : "type-736",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-315",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1040",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-259",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-469",
-   "self_type" : "type-468",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-310",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-311",
-   "self_type" : "type-313",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-321",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase **",
-   "name" : "android::RefBase **",
-   "referenced_type" : "type-23",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const *",
-   "name" : "android::RefBase *const *",
-   "referenced_type" : "type-597",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1095",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1105",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1126",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-157",
-   "self_type" : "type-156",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-759",
-   "self_type" : "type-758",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-816",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-835",
-   "self_type" : "type-834",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-853",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-935",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-987",
-   "self_type" : "type-986",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type **",
-   "name" : "android::RefBase::weakref_type **",
-   "referenced_type" : "type-20",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const *",
-   "name" : "android::RefBase::weakref_type *const *",
-   "referenced_type" : "type-595",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-332",
-   "self_type" : "type-436",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-562",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-202",
-   "self_type" : "type-500",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase *> *",
-   "name" : "android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-617",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-447",
-   "self_type" : "type-613",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-621",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-446",
-   "self_type" : "type-609",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1111",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-442",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-638",
-   "self_type" : "type-637",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-829",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-903",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-548",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-364",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder **",
-   "name" : "android::hardware::BHwBinder **",
-   "referenced_type" : "type-8",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const *",
-   "name" : "android::hardware::BHwBinder *const *",
-   "referenced_type" : "type-593",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder *",
-   "name" : "android::hardware::BpHwBinder *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-578",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
-   "name" : "android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-413",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-330",
-   "self_type" : "type-457",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwRefBase *",
-   "name" : "android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-155",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput *",
-   "name" : "android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-535",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-256",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-852",
-   "self_type" : "type-851",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-968",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-857",
-   "self_type" : "type-856",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump *",
-   "name" : "android::hardware::HexDump *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder *",
-   "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-339",
-   "self_type" : "type-585",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IPCThreadState *",
-   "name" : "android::hardware::IPCThreadState *",
-   "referenced_type" : "type-464",
-   "self_type" : "type-629",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState *",
-   "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
-   "name" : "android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "referenced_type" : "type-512",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput *",
-   "name" : "android::hardware::TextOutput *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-266",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
-   "name" : "android::hardware::TextOutput::Bundle *",
-   "referenced_type" : "type-507",
-   "self_type" : "type-509",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TypeCode *",
-   "name" : "android::hardware::TypeCode *",
-   "referenced_type" : "type-271",
-   "self_type" : "type-514",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-142",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-412",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Thread> *",
-   "name" : "android::sp<android::Thread> *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
-   "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-466",
-   "self_type" : "type-625",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-454",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> *",
-   "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
-   "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-471",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-112",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
-   "name" : "android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-406",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-298",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-114",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-733",
-   "self_type" : "type-734",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-183",
-   "self_type" : "type-185",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-450",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-432",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-172",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-438",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-201",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-463",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase *> *",
-   "name" : "const android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-619",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-610",
-   "self_type" : "type-611",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-443",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-178",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-552",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-545",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BHwBinder *",
-   "name" : "const android::hardware::BHwBinder *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder *",
-   "name" : "const android::hardware::BpHwBinder *",
-   "referenced_type" : "type-325",
-   "self_type" : "type-337",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
-   "name" : "const android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-415",
-   "self_type" : "type-416",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-458",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwRefBase *",
-   "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
-   "name" : "const android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-539",
-   "self_type" : "type-540",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump *",
-   "name" : "const android::hardware::HexDump *",
-   "referenced_type" : "type-273",
-   "self_type" : "type-518",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-567",
-   "self_type" : "type-568",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
-   "name" : "const android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-452",
-   "self_type" : "type-453",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IInterface *",
-   "name" : "const android::hardware::IInterface *",
-   "referenced_type" : "type-588",
-   "self_type" : "type-589",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IPCThreadState *",
-   "name" : "const android::hardware::IPCThreadState *",
-   "referenced_type" : "type-630",
-   "self_type" : "type-632",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel *",
-   "name" : "const android::hardware::Parcel *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState *",
-   "name" : "const android::hardware::ProcessState *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
-   "name" : "const android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode *",
-   "name" : "const android::hardware::TypeCode *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-515",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-407",
-   "self_type" : "type-414",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Thread> *",
-   "name" : "const android::sp<android::Thread> *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
-   "name" : "const android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-631",
-   "self_type" : "type-642",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-433",
-   "self_type" : "type-456",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
-   "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-717",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
-   "name" : "const android::sp<android::hardware::IInterface> *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
-   "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-465",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-441",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
-   "name" : "const android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-794",
-   "self_type" : "type-796",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char16_t *",
-   "name" : "const char16_t *",
-   "referenced_type" : "type-137",
-   "self_type" : "type-136",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-776",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-910",
-   "self_type" : "type-915",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-546",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-248",
-   "self_type" : "type-250",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-85",
-   "self_type" : "type-105",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *",
-   "name" : "const unsigned int *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-721",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long *",
-   "name" : "const unsigned long long *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void **",
-   "name" : "const void **",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double *",
-   "name" : "double *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float *",
-   "name" : "float *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-305",
-   "self_type" : "type-306",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-633",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-240",
-   "self_type" : "type-253",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long *",
-   "name" : "long long *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "short *",
-   "name" : "short *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "signed char *",
-   "name" : "signed char *",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "referenced_type" : "type-519",
-   "self_type" : "type-522",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-914",
-   "self_type" : "type-913",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-572",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long long *",
-   "name" : "unsigned long long *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned short *",
-   "name" : "unsigned short *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(const void *, void *, void *)",
-   "name" : "void (*)(const void *, void *, void *)",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-576",
-   "self_type" : "type-577",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase *const",
-   "name" : "android::RefBase *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1066",
-   "self_type" : "type-1068",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1097",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1105",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1128",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-156",
-   "self_type" : "type-158",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-245",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-427",
-   "self_type" : "type-429",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-45",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-528",
-   "self_type" : "type-530",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-569",
-   "self_type" : "type-571",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-579",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-605",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-758",
-   "self_type" : "type-761",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-816",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-834",
-   "self_type" : "type-836",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-853",
-   "self_type" : "type-855",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-869",
-   "self_type" : "type-871",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-875",
-   "self_type" : "type-877",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-898",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-934",
-   "self_type" : "type-936",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-963",
-   "self_type" : "type-965",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-986",
-   "self_type" : "type-985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_type *const",
-   "name" : "android::RefBase::weakref_type *const",
-   "referenced_type" : "type-20",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::BHwBinder *const",
-   "name" : "android::hardware::BHwBinder *const",
-   "referenced_type" : "type-8",
-   "self_type" : "type-593",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::IBinder *const",
-   "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-33",
-   "self_type" : "type-147",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "char *const",
-   "name" : "char *const",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[10]",
-   "name" : "char const[10]",
-   "referenced_type" : "type-648",
-   "self_type" : "type-647",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[11]",
-   "name" : "char const[11]",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[12]",
-   "name" : "char const[12]",
-   "referenced_type" : "type-645",
-   "self_type" : "type-644",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[13]",
-   "name" : "char const[13]",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[14]",
-   "name" : "char const[14]",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[15]",
-   "name" : "char const[15]",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[16]",
-   "name" : "char const[16]",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[17]",
-   "name" : "char const[17]",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[18]",
-   "name" : "char const[18]",
-   "referenced_type" : "type-677",
-   "self_type" : "type-676",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[19]",
-   "name" : "char const[19]",
-   "referenced_type" : "type-708",
-   "self_type" : "type-707",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[20]",
-   "name" : "char const[20]",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[22]",
-   "name" : "char const[22]",
-   "referenced_type" : "type-711",
-   "self_type" : "type-710",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[25]",
-   "name" : "char const[25]",
-   "referenced_type" : "type-701",
-   "self_type" : "type-700",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[28]",
-   "name" : "char const[28]",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[29]",
-   "name" : "char const[29]",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[2]",
-   "name" : "char const[2]",
-   "referenced_type" : "type-651",
-   "self_type" : "type-650",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[31]",
-   "name" : "char const[31]",
-   "referenced_type" : "type-683",
-   "self_type" : "type-682",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[32]",
-   "name" : "char const[32]",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[35]",
-   "name" : "char const[35]",
-   "referenced_type" : "type-704",
-   "self_type" : "type-703",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[37]",
-   "name" : "char const[37]",
-   "referenced_type" : "type-695",
-   "self_type" : "type-694",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[3]",
-   "name" : "char const[3]",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[4]",
-   "name" : "char const[4]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-118",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[5]",
-   "name" : "char const[5]",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[6]",
-   "name" : "char const[6]",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[7]",
-   "name" : "char const[7]",
-   "referenced_type" : "type-680",
-   "self_type" : "type-679",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[8]",
-   "name" : "char const[8]",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[9]",
-   "name" : "char const[9]",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-182",
-   "self_type" : "type-183",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-450",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-15",
-   "self_type" : "type-430",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-167",
-   "self_type" : "type-171",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-332",
-   "self_type" : "type-437",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-135",
-   "self_type" : "type-201",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-202",
-   "self_type" : "type-463",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase *>",
-   "name" : "const android::Vector<android::RefBase *>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-618",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
-   "name" : "const android::Vector<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-614",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
-   "name" : "const android::Vector<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-610",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-443",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-177",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-549",
-   "self_type" : "type-551",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<int>",
-   "name" : "const android::Vector<int>",
-   "referenced_type" : "type-543",
-   "self_type" : "type-544",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-169",
-   "self_type" : "type-258",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BHwBinder",
-   "name" : "const android::hardware::BHwBinder",
-   "referenced_type" : "type-9",
-   "self_type" : "type-117",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder",
-   "name" : "const android::hardware::BpHwBinder",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
-   "name" : "const android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-338",
-   "self_type" : "type-415",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager",
-   "referenced_type" : "type-330",
-   "self_type" : "type-458",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-334",
-   "self_type" : "type-422",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwRefBase",
-   "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-146",
-   "self_type" : "type-161",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput",
-   "name" : "const android::hardware::BufferedTextOutput",
-   "referenced_type" : "type-534",
-   "self_type" : "type-539",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::HexDump",
-   "name" : "const android::hardware::HexDump",
-   "referenced_type" : "type-274",
-   "self_type" : "type-273",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder",
-   "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-14",
-   "self_type" : "type-567",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
-   "name" : "const android::hardware::IBinder::DeathRecipient",
-   "referenced_type" : "type-60",
-   "self_type" : "type-452",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IInterface",
-   "name" : "const android::hardware::IInterface",
-   "referenced_type" : "type-339",
-   "self_type" : "type-588",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IPCThreadState",
-   "name" : "const android::hardware::IPCThreadState",
-   "referenced_type" : "type-464",
-   "self_type" : "type-630",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState",
-   "name" : "const android::hardware::ProcessState",
-   "referenced_type" : "type-195",
-   "self_type" : "type-211",
-   "size" : 128,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
-   "name" : "const android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::TypeCode",
-   "name" : "const android::hardware::TypeCode",
-   "referenced_type" : "type-271",
-   "self_type" : "type-270",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-134",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Thread>",
-   "name" : "const android::sp<android::Thread>",
-   "referenced_type" : "type-34",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
-   "name" : "const android::sp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-631",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "referenced_type" : "type-502",
-   "self_type" : "type-526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-754",
-   "self_type" : "type-753",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-51",
-   "self_type" : "type-160",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
-   "name" : "const android::sp<android::hardware::IInterface>",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
-   "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-193",
-   "self_type" : "type-465",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
-   "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-115",
-   "self_type" : "type-204",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-203",
-   "self_type" : "type-510",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const char16_t",
-   "name" : "const char16_t",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-97",
-   "self_type" : "type-350",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-777",
-   "self_type" : "type-776",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-911",
-   "self_type" : "type-910",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-95",
-   "self_type" : "type-309",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-327",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-240",
-   "self_type" : "type-248",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-93",
-   "self_type" : "type-145",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-89",
-   "self_type" : "type-402",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-87",
-   "self_type" : "type-399",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-635",
-   "self_type" : "type-634",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-774",
-   "self_type" : "type-773",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-66",
-   "self_type" : "type-73",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char *const",
-   "name" : "const unsigned char *const",
-   "referenced_type" : "type-72",
-   "self_type" : "type-718",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int *const",
-   "name" : "const unsigned int *const",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-68",
-   "self_type" : "type-75",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-91",
-   "self_type" : "type-404",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-104",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const void *const",
-   "name" : "const void *const",
-   "referenced_type" : "type-103",
-   "self_type" : "type-410",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-12",
-   "self_type" : "type-660",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile int",
-   "name" : "volatile int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-205",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-425"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "d_",
-     "field_offset" : 32,
-     "referenced_type" : "type-532"
-    },
-    {
-     "access" : "private",
-     "field_name" : "s_",
-     "field_offset" : 64,
-     "referenced_type" : "type-533"
-    }
-   ],
-   "linker_set_key" : "Renamer",
-   "name" : "Renamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
-    },
-    {
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-621"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-167"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-135", "type-51" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-332"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-103", "type-334" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-3" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-40"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-312"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-317"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-320"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-320"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-16"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "record_kind" : "class",
-   "referenced_type" : "type-167",
-   "self_type" : "type-167",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-170" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-168"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-333" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-168",
-   "self_type" : "type-168",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-136"
-    }
-   ],
-   "linker_set_key" : "android::String16",
-   "name" : "android::String16",
-   "record_kind" : "class",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "unique_id" : "_ZTSN7android8String16E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-203"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-41"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-43"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-43"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-34"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase *>",
-   "name" : "android::Vector<android::RefBase *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
-   "name" : "android::Vector<android::RefBase::weakref_type *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-202" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
-   "name" : "android::Vector<android::hardware::BHwBinder *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "record_kind" : "class",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-169"
-    }
-   ],
-   "linker_set_key" : "android::Vector<int>",
-   "name" : "android::Vector<int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android6VectorIiEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135", "type-51" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103", "type-334" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPolicy",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExtras",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReserved0",
-     "field_offset" : 128,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BHwBinder",
-   "name" : "android::hardware::BHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlive",
-     "field_offset" : 96,
-     "referenced_type" : "type-205"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObitsSent",
-     "field_offset" : 128,
-     "referenced_type" : "type-205"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObituaries",
-     "field_offset" : 160,
-     "referenced_type" : "type-328"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 192,
-     "referenced_type" : "type-330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mConstantData",
-     "field_offset" : 352,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDescriptorCache",
-     "field_offset" : 384,
-     "referenced_type" : "type-135"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder",
-   "name" : "android::hardware::BpHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 52,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "recipient",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "cookie",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
-   "name" : "android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "referenced_type" : "type-331"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
-   "name" : "android::hardware::BpHwBinder::ObjectManager",
-   "record_kind" : "class",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "object",
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cleanupCookie",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "func",
-     "field_offset" : 64,
-     "referenced_type" : "type-335"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRemote",
-     "field_offset" : 32,
-     "referenced_type" : "type-147"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 96,
-     "referenced_type" : "type-148"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwRefBase",
-   "name" : "android::hardware::BpHwRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-267"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSeq",
-     "field_offset" : 64,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-327"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 128,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGlobalState",
-     "field_offset" : 160,
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BufferedTextOutput",
-   "name" : "android::hardware::BufferedTextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBytesPerLine",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSingleLineCutoff",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlignment",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCArrayStyle",
-     "field_offset" : 160,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "linker_set_key" : "android::hardware::HexDump",
-   "name" : "android::hardware::HexDump",
-   "record_kind" : "class",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder",
-   "name" : "android::hardware::IBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
-   "name" : "android::hardware::IBinder::DeathRecipient",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IInterface",
-   "name" : "android::hardware::IInterface",
-   "record_kind" : "class",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mProcess",
-     "referenced_type" : "type-465"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingStrongDerefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-446"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingWeakDerefs",
-     "field_offset" : 192,
-     "referenced_type" : "type-447"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteStrongDerefs",
-     "field_offset" : 352,
-     "referenced_type" : "type-448"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteWeakDerefs",
-     "field_offset" : 512,
-     "referenced_type" : "type-447"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIn",
-     "field_offset" : 672,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOut",
-     "field_offset" : 1216,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastError",
-     "field_offset" : 1760,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingPid",
-     "field_offset" : 1792,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingSid",
-     "field_offset" : 1824,
-     "referenced_type" : "type-203"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingUid",
-     "field_offset" : 1856,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStrictModePolicy",
-     "field_offset" : 1888,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastTransactionBinderFlags",
-     "field_offset" : 1920,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContextObject",
-     "field_offset" : 1952,
-     "referenced_type" : "type-466"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsLooper",
-     "field_offset" : 1984,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsPollingThread",
-     "field_offset" : 1992,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostCommandTasks",
-     "field_offset" : 2016,
-     "referenced_type" : "type-467"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIPCThreadStateBase",
-     "field_offset" : 2112,
-     "referenced_type" : "type-468"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 2144,
-     "referenced_type" : "type-206"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IPCThreadState",
-   "name" : "android::hardware::IPCThreadState",
-   "record_kind" : "class",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
-   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBufCachePos",
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufCache",
-     "field_offset" : 32,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mError",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 160,
-     "referenced_type" : "type-65"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataCapacity",
-     "field_offset" : 224,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataPos",
-     "field_offset" : 256,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 288,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsCapacity",
-     "field_offset" : 352,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNextObjectHint",
-     "field_offset" : 384,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumRef",
-     "field_offset" : 416,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFdsKnown",
-     "field_offset" : 448,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHasFds",
-     "field_offset" : 456,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllowFds",
-     "field_offset" : 464,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 480,
-     "referenced_type" : "type-69"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnerCookie",
-     "field_offset" : 512,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel",
-   "name" : "android::hardware::Parcel",
-   "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6ParcelE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "index",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "buffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-68"
-    },
-    {
-     "field_name" : "bufend",
-     "field_offset" : 128,
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
-   "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDriverFD",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVMStart",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-196"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountDecrement",
-     "field_offset" : 128,
-     "referenced_type" : "type-197"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExecutingThreadsCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMaxThreads",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStarvationStartTimeMs",
-     "field_offset" : 256,
-     "referenced_type" : "type-93"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 320,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandleToObject",
-     "field_offset" : 352,
-     "referenced_type" : "type-174"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mManagesContexts",
-     "field_offset" : 512,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextCheckFunc",
-     "field_offset" : 544,
-     "referenced_type" : "type-198"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextUserData",
-     "field_offset" : 576,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContexts",
-     "field_offset" : 608,
-     "referenced_type" : "type-182"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRootDir",
-     "field_offset" : 768,
-     "referenced_type" : "type-202"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolStarted",
-     "field_offset" : 800,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSpawnThreadOnStart",
-     "field_offset" : 808,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolSeq",
-     "field_offset" : 832,
-     "referenced_type" : "type-205"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMmapSize",
-     "field_offset" : 864,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 896,
-     "referenced_type" : "type-206"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState",
-   "name" : "android::hardware::ProcessState",
-   "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 128,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 116,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -116,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -116,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "binder",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
-   "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput",
-   "name" : "android::hardware::TextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTO",
-     "referenced_type" : "type-508"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TextOutput::Bundle",
-   "name" : "android::hardware::TextOutput::Bundle",
-   "record_kind" : "class",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCode",
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TypeCode",
-   "name" : "android::hardware::TypeCode",
-   "record_kind" : "class",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-135"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-51"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135", "type-51" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-334"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103", "type-334" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
-   "name" : "android::sp<android::hardware::BHwBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-503"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-505" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-585"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-339" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-194"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
-   "name" : "android::sp<android::hardware::ProcessState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
-   "name" : "android::trait_pointer<android::RefBase *>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::String16>",
-   "name" : "android::trait_pointer<android::String16>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<const void *>",
-   "name" : "android::trait_pointer<const void *>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<int>",
-   "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
-   "name" : "android::trait_trivial_copy<android::RefBase *>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
-   "name" : "android::trait_trivial_copy<android::String16>",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<const void *>",
-   "name" : "android::trait_trivial_copy<const void *>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
-   "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
-   "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase *>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
-   "name" : "android::trait_trivial_ctor<android::String16>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
-   "name" : "android::trait_trivial_ctor<const void *>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long long>",
-   "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-372",
-   "self_type" : "type-372",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
-   "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
-   "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
-   "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase *>",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
-   "name" : "android::trait_trivial_dtor<android::String16>",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
-   "name" : "android::trait_trivial_dtor<const void *>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long long>",
-   "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
-   "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
-   "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
-   "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
-   "name" : "android::trait_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String16>",
-   "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-202" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-349",
-   "self_type" : "type-349",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<const void *>",
-   "name" : "android::trait_trivial_move<const void *>",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-373" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned int>",
-   "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long>",
-   "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-378" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-362",
-   "self_type" : "type-362",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase *>",
-   "name" : "android::traits<android::RefBase *>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
-   "name" : "android::traits<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::String16>",
-   "name" : "android::traits<android::String16>",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-135" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
-   "name" : "android::traits<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-334" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<const void *>",
-   "name" : "android::traits<const void *>",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android6traitsIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<int>",
-   "name" : "android::traits<int>",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android6traitsIiEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-604"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
-   "name" : "android::use_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-602"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-600"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-420"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-338" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-151"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-134" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-418"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-408" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-564"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-502" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-244"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<int>",
-   "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder>",
-   "name" : "android::wp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-292"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-301"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-295"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-298"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-65"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-293"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-302"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-292"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-241"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-242"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-231"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-231"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-220"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-213"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-190"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-191"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-191"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-191"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-191"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-84"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "lock",
-     "referenced_type" : "type-542"
-    },
-    {
-     "field_name" : "has_tls",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tls",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "thread_store_t",
-   "name" : "thread_store_t",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
-   "unique_id" : "thread_store_t"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "referenced_type" : "type-434",
-   "self_type" : "type-455",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
-   "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
+ "elf_objects" : [],
+ "enum_types" : [],
+ "function_types" : [],
+ "functions" : [],
+ "global_vars" : [],
+ "lvalue_reference_types" : [],
+ "pointer_types" : [],
+ "qualified_types" : [],
+ "record_types" : [],
+ "rvalue_reference_types" : []
 }
diff --git a/29/64/x86/source-based/libhidlbase.so.lsdump b/29/64/x86/source-based/libhidlbase.so.lsdump
index b903929..27a5247 100644
--- a/29/64/x86/source-based/libhidlbase.so.lsdump
+++ b/29/64/x86/source-based/libhidlbase.so.lsdump
@@ -5,40 +5,274 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-664",
+   "referenced_type" : "type-43",
+   "self_type" : "type-175",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "char [10]",
+   "name" : "char [10]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3466",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [11]",
+   "name" : "char [11]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3492",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [12]",
+   "name" : "char [12]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3463",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [13]",
+   "name" : "char [13]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3459",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [14]",
+   "name" : "char [14]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3510",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [15]",
+   "name" : "char [15]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3608",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "type-43",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [17]",
+   "name" : "char [17]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3513",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [18]",
+   "name" : "char [18]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3498",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [19]",
+   "name" : "char [19]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3529",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [20]",
+   "name" : "char [20]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3507",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [22]",
+   "name" : "char [22]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3532",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [25]",
+   "name" : "char [25]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3522",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [28]",
+   "name" : "char [28]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3544",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [29]",
+   "name" : "char [29]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3519",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [2]",
+   "name" : "char [2]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3470",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [31]",
+   "name" : "char [31]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3504",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3535",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [35]",
+   "name" : "char [35]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3525",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [37]",
+   "name" : "char [37]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3516",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [3]",
+   "name" : "char [3]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3483",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4]",
+   "name" : "char [4]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3605",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [5]",
+   "name" : "char [5]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3611",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [6]",
+   "name" : "char [6]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3474",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [7]",
+   "name" : "char [7]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3501",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [8]",
+   "name" : "char [8]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3487",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [9]",
+   "name" : "char [9]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3477",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-237",
+   "self_type" : "type-236",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-435",
+   "referenced_type" : "type-146",
+   "self_type" : "type-973",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46,8 +280,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-670",
+   "referenced_type" : "type-146",
+   "self_type" : "type-181",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -55,8 +289,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-102",
-   "self_type" : "type-713",
+   "referenced_type" : "type-44",
+   "self_type" : "type-227",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +303,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1
   },
   {
@@ -78,8 +312,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1
   },
   {
@@ -88,8 +322,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 2
   },
   {
@@ -104,8 +338,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 4
   },
   {
@@ -113,8 +347,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -122,8 +356,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4
   },
   {
@@ -131,8 +365,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 8
   },
   {
@@ -140,8 +374,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 2
   },
   {
@@ -149,8 +383,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 1
   },
   {
@@ -159,8 +393,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -169,8 +403,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4
   },
   {
@@ -179,8 +413,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4
   },
   {
@@ -189,8 +423,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8
   },
   {
@@ -199,15 +433,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108"
+   "referenced_type" : "type-77",
+   "self_type" : "type-77"
   }
  ],
  "elf_functions" :
@@ -218,10 +452,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
   },
   {
@@ -1173,6 +1423,78 @@
    "name" : "_ZN7android4hidl7manager4V1_218BpHwServiceManagerC2ERKNS_2spINS_8hardware7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE"
   },
   {
@@ -1203,6 +1525,36 @@
    "name" : "_ZN7android8hardware10HidlMemoryD2Ev"
   },
   {
+   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD2Ev"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
@@ -1219,6 +1571,30 @@
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl7manager4V1_215IServiceManagerENS4_18BpHwServiceManagerENS4_18BnHwServiceManagerEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware11hidl_handle10freeHandleEv"
   },
   {
@@ -1330,18 +1706,243 @@
    "name" : "_ZN7android8hardware11hidl_stringaSERKS1_"
   },
   {
+   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_6StatusEPNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
    "name" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware14readFromParcelERKNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_"
   },
   {
@@ -1354,9 +1955,45 @@
    "name" : "_ZN7android8hardware16setRequestingSidERKNS_2spINS_4hidl4base4V1_05IBaseEEEb"
   },
   {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android8hardware17joinRpcThreadpoolEv"
   },
   {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE"
   },
   {
@@ -1375,6 +2012,9 @@
    "name" : "_ZN7android8hardware20LazyServiceRegistrarC2Ev"
   },
   {
+   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware21defaultServiceManagerEv"
   },
   {
@@ -1441,6 +2081,184 @@
    "name" : "_ZN7android8hardware31setProcessHidlReturnRestrictionENS0_21HidlReturnRestrictionE"
   },
   {
+   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel6removeEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8growDataEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9initStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware6Status11fromStatusTEi"
   },
   {
@@ -1471,6 +2289,30 @@
    "name" : "_ZN7android8hardware6StatusC2EiiPKc"
   },
   {
+   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE"
   },
   {
@@ -1650,12 +2492,75 @@
    "name" : "_ZN7android8hardware7details25registerAsServiceInternalERKNS_2spINS_4hidl4base4V1_05IBaseEEERKNSt3__112basic_stringIcNSA_11char_traitsIcEENSA_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
+  },
+  {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE"
   },
   {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE"
   },
   {
+   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv"
   },
   {
@@ -1677,12 +2582,259 @@
    "name" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv"
   },
   {
+   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4dataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
+  },
+  {
    "name" : "_ZNK7android8hardware6Status11descriptionEv"
   },
   {
+   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware7details13return_status8assertOkEv"
   },
   {
+   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNKSt3__110__back_refIcE6__execERNS_7__stateIcEE"
   },
@@ -2539,13 +3691,79 @@
    "name" : "_ZTv0_n12_N7android4hidl7manager4V1_218BnHwServiceManagerD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+  },
+  {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD0Ev"
   },
   {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
    "name" : "__udivdi3"
+  },
+  {
+   "name" : "getHWBinderKernelReferences"
+  },
+  {
+   "name" : "printHexData"
+  },
+  {
+   "name" : "printTypeCode"
+  },
+  {
+   "name" : "stringForIndent"
   }
  ],
  "elf_objects" :
@@ -2597,6 +3815,21 @@
    "name" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE"
   },
   {
+   "name" : "_ZN7android8hardware12gTextBuffersE"
+  },
+  {
+   "name" : "_ZN7android8hardware13gProcessMutexE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aerrE"
+  },
+  {
+   "name" : "_ZN7android8hardware4alogE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aoutE"
+  },
+  {
    "name" : "_ZN7android8hardware7details14gServiceSidMapE"
   },
   {
@@ -2612,6 +3845,9 @@
    "name" : "_ZN7android8hardware7details6gBnMapE"
   },
   {
+   "name" : "_ZN7android8hardware8gProcessE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android4hidl4base4V1_06BsBaseE0_NS2_5IBaseE"
   },
@@ -2807,6 +4043,13 @@
    "name" : "_ZTCN7android4hidl7manager4V1_218BpHwServiceManagerE8_NS_8hardware11BpHwRefBaseE"
   },
   {
+   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE0_NS4_5IBaseE"
   },
@@ -2836,6 +4079,9 @@
    "name" : "_ZTCN7android8hardware7details6WaiterE0_NS_4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE0_NS_13basic_istreamIcS2_EE"
   },
@@ -2853,6 +4099,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
   },
   {
@@ -2910,16 +4168,31 @@
    "name" : "_ZTTN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "name" : "_ZTTN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTTN7android8hardware10IInterfaceE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
+   "name" : "_ZTTN7android8hardware12ProcessStateE"
+  },
+  {
    "name" : "_ZTTN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTTN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware7details21ClientCounterCallbackE"
   },
   {
@@ -2927,6 +4200,9 @@
    "name" : "_ZTTN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTTN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE"
   },
@@ -2939,6 +4215,14 @@
    "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
    "name" : "_ZTVN7android4hidl4base4V1_05IBaseE"
   },
   {
@@ -3017,20 +4301,85 @@
    "name" : "_ZTVN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIiEE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTVN7android8hardware10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware10PoolThreadE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10TextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android8hardware12FdTextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware12ProcessStateE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware13LogTextOutputE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android8hardware25PassthroughServiceManagerE"
   },
   {
    "name" : "_ZTVN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTVN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware7details16HidlInstrumentorE"
   },
   {
@@ -3041,6 +4390,9 @@
    "name" : "_ZTVN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTVN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__110__back_refIcEE"
   },
@@ -3126,6 +4478,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -3202,11 +4558,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -3220,11 +4576,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -3238,11 +4594,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -3264,11 +4620,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -3294,11 +4650,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -3316,11 +4672,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-276",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -3329,6 +4685,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-14",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -3370,11 +4752,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -3424,11 +4806,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -3450,11 +4832,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -3468,11 +4850,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -3494,11 +4876,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-182",
+   "underlying_type" : "type-146",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3544,11 +4926,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -3598,11 +4980,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -3624,11 +5006,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -3666,11 +5048,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -3908,11 +5290,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-698",
-   "self_type" : "type-698",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -3938,11 +5320,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -3968,11 +5350,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4010,11 +5392,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-228",
+   "self_type" : "type-228",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_component"
   },
   {
@@ -4048,11 +5430,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_format"
   },
   {
@@ -4074,11 +5456,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-216",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -4092,11 +5474,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-221",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -4122,11 +5504,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-225",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -4216,11 +5598,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-696",
-   "self_type" : "type-696",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -4258,11 +5640,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -4276,11 +5658,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -4306,11 +5688,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -4340,11 +5722,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_transform_t"
   },
   {
@@ -4394,11 +5776,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "log_id"
   }
  ],
@@ -4406,18 +5788,138 @@
  [
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    }
+   ],
+   "referenced_type" : "type-2291",
+   "return_type" : "type-2287",
+   "self_type" : "type-2291",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-694"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2241",
+   "return_type" : "type-29",
+   "self_type" : "type-2241",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (void *)",
    "name" : "int (void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     }
    ],
-   "referenced_type" : "type-728",
-   "return_type" : "type-17",
-   "self_type" : "type-728",
+   "referenced_type" : "type-242",
+   "return_type" : "type-14",
+   "self_type" : "type-242",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2303"
+    }
+   ],
+   "referenced_type" : "type-2302",
+   "return_type" : "type-2303",
+   "self_type" : "type-2302",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2165"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2164",
+   "return_type" : "type-77",
+   "self_type" : "type-2164",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (const void *, void *, void *)",
+   "name" : "void (const void *, void *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2158",
+   "return_type" : "type-77",
+   "self_type" : "type-2158",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (void *, const char *)",
+   "name" : "void (void *, const char *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "referenced_type" : "type-3397",
+   "return_type" : "type-77",
+   "self_type" : "type-3397",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "functions" :
@@ -4429,10 +5931,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-448"
+    },
+    {
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-3653",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -4442,29 +5960,77 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-743"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-435"
+    },
+    {
+     "referenced_type" : "type-436"
+    }
+   ],
+   "return_type" : "type-438",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-435"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-438",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2193"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-3567",
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::hidl::base::V1_0::IBase::linkToDeath",
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4474,13 +6040,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2118"
+     "referenced_type" : "type-2560"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4490,13 +6056,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2119"
+     "referenced_type" : "type-2561"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4506,13 +6072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4522,13 +6088,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2120"
+     "referenced_type" : "type-2562"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4538,13 +6104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4554,10 +6120,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4567,10 +6133,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4580,10 +6146,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4593,16 +6159,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4611,14 +6177,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4629,13 +6195,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-2124"
+     "referenced_type" : "type-2566"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4645,13 +6211,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4661,13 +6227,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4676,19 +6242,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2127"
+     "referenced_type" : "type-2569"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4698,27 +6264,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2128"
+     "referenced_type" : "type-2570"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4727,19 +6293,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4750,13 +6316,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-2130"
+     "referenced_type" : "type-2572"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4765,19 +6331,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2131"
+     "referenced_type" : "type-2573"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4786,19 +6352,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2132"
+     "referenced_type" : "type-2574"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4807,19 +6373,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2133"
+     "referenced_type" : "type-2575"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4828,19 +6394,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2134"
+     "referenced_type" : "type-2576"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4849,19 +6415,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2135"
+     "referenced_type" : "type-2577"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4872,10 +6438,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4885,13 +6451,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4901,19 +6467,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4923,13 +6489,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4939,19 +6505,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4961,10 +6527,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4974,10 +6540,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4987,10 +6553,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4999,13 +6565,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5014,19 +6580,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5036,16 +6602,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5055,13 +6621,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2136"
+     "referenced_type" : "type-2578"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5071,13 +6637,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2137"
+     "referenced_type" : "type-2579"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5087,13 +6653,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5103,13 +6669,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2138"
+     "referenced_type" : "type-2580"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5118,16 +6684,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2139"
+     "referenced_type" : "type-2581"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5136,16 +6702,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2140"
+     "referenced_type" : "type-2582"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5155,13 +6721,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2141"
+     "referenced_type" : "type-2583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5170,16 +6736,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2142"
+     "referenced_type" : "type-2584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5189,10 +6755,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5202,10 +6768,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5214,16 +6780,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2143"
+     "referenced_type" : "type-2585"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5232,13 +6798,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5247,13 +6813,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5263,10 +6829,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5276,16 +6842,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5295,13 +6861,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5311,13 +6877,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5327,14 +6893,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5344,16 +6910,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5363,13 +6929,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5379,13 +6945,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5395,14 +6961,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5412,13 +6978,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5428,13 +6994,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5444,14 +7010,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5461,13 +7027,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1039"
+     "referenced_type" : "type-1418"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5477,10 +7043,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5490,10 +7056,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5502,13 +7068,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5518,10 +7084,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5531,16 +7097,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5549,14 +7115,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5565,14 +7131,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5583,13 +7149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1421"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5599,13 +7165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5615,13 +7181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5630,19 +7196,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1427"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5652,27 +7218,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1428"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5683,13 +7249,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-1050"
+     "referenced_type" : "type-1429"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5698,19 +7264,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-1430"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5719,19 +7285,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1052"
+     "referenced_type" : "type-1431"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5740,19 +7306,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1053"
+     "referenced_type" : "type-1432"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5761,19 +7327,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5782,19 +7348,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5805,10 +7371,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5817,19 +7383,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1435"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5838,19 +7404,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5860,13 +7426,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5876,13 +7442,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5892,10 +7458,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5905,10 +7471,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5918,10 +7484,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5930,16 +7496,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5949,16 +7515,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5968,13 +7534,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1059"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5984,13 +7550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1060"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6000,16 +7566,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6019,13 +7585,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6035,13 +7601,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1440"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6050,16 +7616,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6069,16 +7635,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1063"
+     "referenced_type" : "type-1442"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6087,19 +7653,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6109,13 +7675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1064"
+     "referenced_type" : "type-1443"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6124,19 +7690,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1065"
+     "referenced_type" : "type-1444"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6146,10 +7712,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6159,10 +7725,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6172,19 +7738,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6194,16 +7760,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6212,22 +7778,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6236,19 +7802,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6258,16 +7824,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6277,16 +7843,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6296,13 +7862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1066"
+     "referenced_type" : "type-1445"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6312,10 +7878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6325,16 +7891,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6343,19 +7909,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6364,19 +7930,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6386,13 +7952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1067"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6402,13 +7968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6418,13 +7984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6434,14 +8000,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6451,16 +8017,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6470,13 +8036,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6486,13 +8052,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1069"
+     "referenced_type" : "type-1448"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6502,14 +8068,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6519,13 +8085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6535,13 +8101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1070"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6551,14 +8117,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6568,13 +8134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1071"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6584,10 +8150,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6597,10 +8163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6609,13 +8175,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6625,10 +8191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6638,16 +8204,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6656,14 +8222,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6672,14 +8238,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6690,13 +8256,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1453"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6706,13 +8272,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6722,13 +8288,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6737,19 +8303,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1034"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6758,19 +8324,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1034"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6780,27 +8346,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1088"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1077"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6811,13 +8377,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-1078"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6826,19 +8392,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1088"
     },
     {
-     "referenced_type" : "type-1079"
+     "referenced_type" : "type-1458"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6849,10 +8415,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6862,13 +8428,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6878,13 +8444,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6894,10 +8460,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6907,10 +8473,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6920,10 +8486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6933,16 +8499,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6952,13 +8518,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1080"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6968,13 +8534,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1081"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6984,13 +8550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7000,13 +8566,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1082"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7016,19 +8582,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7038,13 +8604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1083"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7053,22 +8619,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-1049"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7078,10 +8644,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7091,10 +8657,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7104,10 +8670,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7117,16 +8683,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7136,13 +8702,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7152,13 +8718,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7168,14 +8734,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7185,16 +8751,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7204,13 +8770,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1084"
+     "referenced_type" : "type-1463"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7220,13 +8786,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1085"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7236,14 +8802,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7253,13 +8819,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7269,13 +8835,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1086"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7285,14 +8851,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7302,13 +8868,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1087"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7318,10 +8884,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7331,10 +8897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7343,13 +8909,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7359,10 +8925,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7372,16 +8938,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7390,14 +8956,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7406,14 +8972,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7422,14 +8988,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7440,13 +9006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7456,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7472,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7488,27 +9054,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1145"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1146"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1475"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7519,13 +9085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1476"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7534,19 +9100,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1145"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1146"
     },
     {
-     "referenced_type" : "type-1098"
+     "referenced_type" : "type-1477"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7557,10 +9123,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7570,13 +9136,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7586,13 +9152,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7602,10 +9168,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7615,10 +9181,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7628,10 +9194,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7641,16 +9207,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7660,13 +9226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1478"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7676,13 +9242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1479"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7692,16 +9258,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7711,13 +9277,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7727,13 +9293,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1480"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7743,16 +9309,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-1481"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7762,13 +9328,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1482"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7778,10 +9344,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7791,10 +9357,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7804,19 +9370,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7826,16 +9392,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7845,19 +9411,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7866,22 +9432,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-1104"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7891,16 +9457,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7910,16 +9476,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7929,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1483"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7945,10 +9511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7958,16 +9524,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7977,13 +9543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1484"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7993,13 +9559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8009,13 +9575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8025,14 +9591,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8042,16 +9608,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8061,13 +9627,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2144"
+     "referenced_type" : "type-2586"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8077,13 +9643,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2145"
+     "referenced_type" : "type-2587"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8093,14 +9659,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8110,13 +9676,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8126,13 +9692,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2146"
+     "referenced_type" : "type-2588"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8142,14 +9708,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8159,13 +9725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2147"
+     "referenced_type" : "type-2589"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8175,10 +9741,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8188,10 +9754,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8200,13 +9766,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8216,10 +9782,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8229,16 +9795,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8247,14 +9813,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8263,14 +9829,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8280,14 +9846,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8297,16 +9863,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8316,13 +9882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2148"
+     "referenced_type" : "type-2590"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8332,13 +9898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2149"
+     "referenced_type" : "type-2591"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8348,14 +9914,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8365,13 +9931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8381,13 +9947,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2150"
+     "referenced_type" : "type-2592"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8397,14 +9963,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8414,13 +9980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2151"
+     "referenced_type" : "type-2593"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8430,10 +9996,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8443,10 +10009,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8455,13 +10021,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8471,10 +10037,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8484,16 +10050,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8502,14 +10068,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8518,14 +10084,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8534,14 +10100,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8550,14 +10116,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8568,13 +10134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2154"
+     "referenced_type" : "type-2596"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8584,13 +10150,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8600,13 +10166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8617,13 +10183,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2601"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8633,13 +10199,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8649,13 +10215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8665,27 +10231,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
-     "referenced_type" : "type-1757"
+     "referenced_type" : "type-1988"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2166"
+     "referenced_type" : "type-2608"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8696,13 +10262,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-2167"
+     "referenced_type" : "type-2609"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8711,19 +10277,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
-     "referenced_type" : "type-1757"
+     "referenced_type" : "type-1988"
     },
     {
-     "referenced_type" : "type-2168"
+     "referenced_type" : "type-2610"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8734,10 +10300,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8747,13 +10313,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8763,13 +10329,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8779,10 +10345,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8792,10 +10358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8805,10 +10371,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8818,27 +10384,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2611"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8849,13 +10415,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-2170"
+     "referenced_type" : "type-2612"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8864,19 +10430,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2171"
+     "referenced_type" : "type-2613"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8885,19 +10451,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2614"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8906,19 +10472,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2173"
+     "referenced_type" : "type-2615"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8927,19 +10493,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2174"
+     "referenced_type" : "type-2616"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8948,19 +10514,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2175"
+     "referenced_type" : "type-2617"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8971,10 +10537,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8984,13 +10550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9000,13 +10566,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9016,10 +10582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9029,10 +10595,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9042,10 +10608,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9055,16 +10621,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9074,13 +10640,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2176"
+     "referenced_type" : "type-2618"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9090,13 +10656,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2177"
+     "referenced_type" : "type-2619"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9106,13 +10672,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9122,13 +10688,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2620"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9137,19 +10703,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1936"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9159,13 +10725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2621"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9175,10 +10741,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9188,10 +10754,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9201,10 +10767,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9214,16 +10780,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9233,16 +10799,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9252,13 +10818,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9268,13 +10834,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9284,16 +10850,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9303,19 +10869,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9325,13 +10891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2622"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9341,13 +10907,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2623"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9357,16 +10923,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9376,19 +10942,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9398,13 +10964,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9414,13 +10980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2182"
+     "referenced_type" : "type-2624"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9430,16 +10996,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2183"
+     "referenced_type" : "type-2625"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9448,22 +11014,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9472,22 +11038,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9497,13 +11063,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2626"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9513,10 +11079,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9526,10 +11092,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9539,22 +11105,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9564,16 +11130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2185"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9583,19 +11149,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9605,16 +11171,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9624,16 +11190,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9643,19 +11209,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9664,25 +11230,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9691,19 +11257,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2186"
+     "referenced_type" : "type-2628"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9712,19 +11278,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9734,16 +11300,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9753,16 +11319,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9772,13 +11338,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2187"
+     "referenced_type" : "type-2629"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9788,10 +11354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9801,16 +11367,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9820,13 +11386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2188"
+     "referenced_type" : "type-2630"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9836,13 +11402,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9852,25 +11418,435 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2218"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-2147",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::sendObituary",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2172"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-906"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2227"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2631"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::HidlMemory::getInstance",
    "linker_set_key" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-65"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9879,10 +11855,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9891,16 +11867,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9911,19 +11887,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9934,10 +11910,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9948,19 +11924,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9971,10 +11947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9984,10 +11960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9997,10 +11973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10010,24 +11986,155 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3410"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3405"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3407"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3407"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3407"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3407"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3708"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3708"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3708"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3708"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::fromBinder",
    "linker_set_key" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-35", "type-373", "type-229" ]
+   "template_args" : [ "type-302", "type-368", "type-299" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10035,12 +12142,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-148", "type-249", "type-247" ]
+   "template_args" : [ "type-495", "type-822", "type-820" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10048,12 +12155,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-156", "type-279", "type-277" ]
+   "template_args" : [ "type-498", "type-848", "type-846" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10061,12 +12168,139 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-129", "type-131", "type-228" ]
+   "template_args" : [ "type-517", "type-729", "type-803" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "access" : "private",
@@ -10076,10 +12310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10089,17 +12323,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10109,13 +12343,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10125,13 +12359,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10141,13 +12375,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10157,10 +12391,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10170,13 +12404,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10186,13 +12420,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10202,13 +12436,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10218,10 +12452,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10231,10 +12465,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10244,10 +12478,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10257,13 +12491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10273,13 +12507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10289,13 +12523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10305,16 +12539,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10324,10 +12558,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10338,16 +12572,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10358,13 +12592,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10374,13 +12608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10390,13 +12624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10406,16 +12640,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10425,13 +12659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10441,13 +12675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10457,10 +12691,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10470,13 +12704,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10486,13 +12720,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10502,16 +12736,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10521,13 +12755,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10537,13 +12771,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10553,10 +12787,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10566,10 +12800,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10579,10 +12813,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10592,13 +12826,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10608,13 +12842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10624,13 +12858,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10640,28 +12874,437 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMaxThreads",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::startThreadPool",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-694"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-3619",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setCallRestriction",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getKernelReferences",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::becomeContextManager",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2243"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-165",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-2194",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::self",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "function_name" : "android::hardware::writeToParcel",
    "linker_set_key" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-787"
+     "referenced_type" : "type-321"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10670,28 +13313,721 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2165"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
+   "return_type" : "type-3448",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::clearCaller",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::stopProcess",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setupPolling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::flushCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearLastError",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::executeCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-3454"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-425"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-336",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-336"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::self",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
+   "return_type" : "type-3448",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::process",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::shutdown",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::transact",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::sendReply",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
    "function_name" : "android::hardware::readFromParcel",
    "linker_set_key" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10700,31 +14036,49 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-265",
+   "return_type" : "type-72",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::release_object",
+   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3430"
+    },
+    {
+     "referenced_type" : "type-3582"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::interfacesEqual",
    "linker_set_key" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_",
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::handleBinderPoll",
    "linker_set_key" : "_ZN7android8hardware16handleBinderPollEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10733,37 +14087,174 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
+   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
+   "return_type" : "type-2318",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::print",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "referenced_type" : "type-41"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::addPostCommandTask",
    "linker_set_key" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-324"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::setupBinderPolling",
    "linker_set_key" : "_ZN7android8hardware18setupBinderPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10772,10 +14263,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10785,17 +14276,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10805,10 +14296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10818,16 +14309,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10836,22 +14327,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::setupTransportPolling",
    "linker_set_key" : "_ZN7android8hardware21setupTransportPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10860,19 +14351,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10881,19 +14372,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10902,19 +14393,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10923,13 +14414,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10938,19 +14429,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10959,19 +14450,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10980,19 +14471,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11001,28 +14492,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-72",
+   "return_type" : "type-383",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11032,13 +14523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-315"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11048,10 +14539,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
-   "return_type" : "type-359",
+   "return_type" : "type-307",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11061,19 +14552,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11083,19 +14574,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11104,25 +14595,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11131,22 +14622,950 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-119"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::Parcel::writeFloat",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-237"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-151"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-336"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::finishWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeDouble",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-6"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeObject",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3582"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3897" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-71"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::restartWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeCString",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInplace",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::writePointer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::continueWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-287"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUnpadded",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::acquireObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::freeDataNoInit",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::releaseObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataCapacity",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeWeakBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3563"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeStrongBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2165"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2163"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
+   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::incrementNumReferences",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
+   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::write",
+   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::remove",
+   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::freeData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::growData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setError",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::initState",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBool",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-483"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::fromStatusT",
    "linker_set_key" : "_ZN7android8hardware6Status11fromStatusTEi",
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11156,16 +15575,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11175,13 +15594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11190,10 +15609,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11202,19 +15621,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "function_name" : "android::hardware::Status::ok",
    "linker_set_key" : "_ZN7android8hardware6Status2okEv",
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11225,16 +15644,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11245,19 +15664,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11268,16 +15687,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11288,35 +15707,162 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2298"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2298"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-2144",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-2147",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::TaskRunner::push",
    "linker_set_key" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-248"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11326,13 +15872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11342,10 +15888,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11355,10 +15901,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11368,10 +15914,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11381,16 +15927,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "function_name" : "android::hardware::details::debuggable",
    "linker_set_key" : "_ZN7android8hardware7details10debuggableEv",
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11399,18 +15945,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-114", "type-35", "type-261" ]
+   "template_args" : [ "type-504", "type-302", "type-830" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11418,18 +15964,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-148", "type-35", "type-249" ]
+   "template_args" : [ "type-495", "type-302", "type-822" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11437,18 +15983,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-35", "type-270" ]
+   "template_args" : [ "type-514", "type-302", "type-839" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11456,18 +16002,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-114", "type-270" ]
+   "template_args" : [ "type-514", "type-504", "type-839" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11475,18 +16021,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-156", "type-35", "type-279" ]
+   "template_args" : [ "type-498", "type-302", "type-848" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11494,18 +16040,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-35", "type-131" ]
+   "template_args" : [ "type-517", "type-302", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11513,18 +16059,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-114", "type-131" ]
+   "template_args" : [ "type-517", "type-504", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11532,18 +16078,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-113", "type-131" ]
+   "template_args" : [ "type-517", "type-514", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -11551,10 +16097,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-1120",
+   "return_type" : "type-1491",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -11564,10 +16110,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11577,10 +16123,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11590,13 +16136,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     },
     {
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-114"
     }
    ],
-   "return_type" : "type-693",
+   "return_type" : "type-205",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11605,10 +16151,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11617,12 +16163,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-35", "type-108" ]
+   "template_args" : [ "type-302", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11630,12 +16176,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-148", "type-108" ]
+   "template_args" : [ "type-495", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11643,12 +16189,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-156", "type-108" ]
+   "template_args" : [ "type-498", "type-77" ]
   },
   {
    "access" : "protected",
@@ -11658,13 +16204,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-142"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11675,14 +16221,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11693,13 +16239,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11709,16 +16255,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11728,16 +16274,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11747,10 +16293,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11760,10 +16306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11773,10 +16319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11785,23 +16331,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
    "function_name" : "android::hardware::details::getPidIfSharable",
    "linker_set_key" : "_ZN7android8hardware7details16getPidIfSharableEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -11810,19 +16356,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::details::getVndkVersionStr",
    "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv",
-   "return_type" : "type-1121",
+   "return_type" : "type-630",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11831,18 +16377,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-261", "type-114", "type-108", "type-108" ]
+   "template_args" : [ "type-830", "type-504", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11850,18 +16396,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-249", "type-148", "type-108", "type-108" ]
+   "template_args" : [ "type-822", "type-495", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11869,18 +16415,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-270", "type-113", "type-108", "type-108" ]
+   "template_args" : [ "type-839", "type-514", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11888,18 +16434,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-279", "type-156", "type-108", "type-108" ]
+   "template_args" : [ "type-848", "type-498", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11907,29 +16453,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-131", "type-129", "type-108", "type-108" ]
+   "template_args" : [ "type-729", "type-517", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-320",
+   "return_type" : "type-884",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-326",
+   "return_type" : "type-885",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -11938,19 +16484,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11959,10 +16505,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -11971,10 +16517,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11983,28 +16529,363 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::onTransact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2632"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-2170"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-2144",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-2172"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-906"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-2175",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2633"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "referenced_type" : "type-3709"
+    }
+   ],
+   "return_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::operator<<",
    "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-58"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-191",
+   "return_type" : "type-58",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12013,26 +16894,58 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     }
    ],
-   "return_type" : "type-691",
+   "return_type" : "type-203",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::BpHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2185"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2238"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::hidl_handle::getNativeHandle",
    "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12042,10 +16955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12055,10 +16968,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12068,10 +16981,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-102",
+   "return_type" : "type-44",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12081,10 +16994,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-100",
+   "return_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12094,10 +17007,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12107,37 +17020,1519 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-1137",
+   "return_type" : "type-643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::isContextManager",
+   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3659"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isServingCall",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
+   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2321"
+    }
+   ],
+   "return_type" : "type-2282",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::clearCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::errorCheck",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::findBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3590"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3589"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-6",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-3593",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3898" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3585"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-2162"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::scanForFds",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcDataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readCString",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-78",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::updateCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataCapacity",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::objectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-297"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3591"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-286",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcBufferSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3594"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3590"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readWeakBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-2194",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::quickFindBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::enforceInterface",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-435"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::verifyBufferObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3598"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16Inplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferChild",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferParent",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3594"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3590"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-435"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3595"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::data",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-990",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::read",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::print",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcData",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::objects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-2165",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3590"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3583"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataAvail",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3588"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-237",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3584"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3587"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-336",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-230"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::description",
    "linker_set_key" : "_ZNK7android8hardware6Status11descriptionEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-111"
     }
    ],
-   "return_type" : "type-1138",
+   "return_type" : "type-644",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::IBinder::checkSubclass",
+   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::return_status::assertOk",
    "linker_set_key" : "_ZNK7android8hardware7details13return_status8assertOkEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-118"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2174"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::getHWBinderKernelReferences",
+   "linker_set_key" : "getHWBinderKernelReferences",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printHexData",
+   "linker_set_key" : "printHexData",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-14"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3398"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printTypeCode",
+   "linker_set_key" : "printTypeCode",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3398"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::stringForIndent",
+   "linker_set_key" : "stringForIndent",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "global_vars" :
@@ -12145,80 +18540,116 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_020IServiceNotification10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceNotification::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_115IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_1::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IClientCallback10descriptorE",
    "name" : "android::hidl::manager::V1_2::IClientCallback::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_2::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_handle21kOffsetOfNativeHandleE",
    "name" : "android::hardware::hidl_handle::kOffsetOfNativeHandle",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
+   "name" : "android::hardware::gTextBuffers",
+   "referenced_type" : "type-2324",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
+   "name" : "android::hardware::gProcessMutex",
+   "referenced_type" : "type-393",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aerrE",
+   "name" : "android::hardware::aerr",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4alogE",
+   "name" : "android::hardware::alog",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aoutE",
+   "name" : "android::hardware::aout",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-1140",
+   "referenced_type" : "type-646",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-1141",
+   "referenced_type" : "type-647",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-822",
+   "referenced_type" : "type-361",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware8gProcessE",
+   "name" : "android::hardware::gProcess",
+   "referenced_type" : "type-2634",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
   }
  ],
  "lvalue_reference_types" :
@@ -12227,8 +18658,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-839",
-   "self_type" : "type-844",
+   "referenced_type" : "type-388",
+   "self_type" : "type-393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12236,17 +18667,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-850",
-   "self_type" : "type-855",
+   "referenced_type" : "type-399",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const &",
+   "name" : "android::RefBase *const &",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const &",
+   "name" : "android::RefBase::weakref_type *const &",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-763",
-   "self_type" : "type-773",
+   "referenced_type" : "type-286",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12254,17 +18703,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-659",
+   "referenced_type" : "type-165",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const &",
+   "name" : "android::hardware::BHwBinder *const &",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3434",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
-   "referenced_type" : "type-30",
-   "self_type" : "type-50",
+   "referenced_type" : "type-664",
+   "self_type" : "type-676",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12272,8 +18730,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
-   "referenced_type" : "type-42",
-   "self_type" : "type-53",
+   "referenced_type" : "type-670",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12281,8 +18739,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-587",
+   "self_type" : "type-885",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -12290,17 +18748,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-347",
+   "self_type" : "type-884",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump &",
+   "name" : "android::hardware::HexDump &",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2299",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1222",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12308,8 +18775,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12317,17 +18784,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel &",
+   "name" : "android::hardware::Parcel &",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
+   "name" : "android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
-   "referenced_type" : "type-180",
-   "self_type" : "type-185",
+   "referenced_type" : "type-765",
+   "self_type" : "type-768",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12335,8 +18820,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-172",
-   "self_type" : "type-177",
+   "referenced_type" : "type-758",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12344,8 +18829,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-405",
+   "referenced_type" : "type-945",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12353,8 +18838,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12362,8 +18847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
-   "referenced_type" : "type-615",
-   "self_type" : "type-618",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12371,8 +18856,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12380,8 +18865,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2019",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12389,8 +18874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-411",
-   "self_type" : "type-738",
+   "referenced_type" : "type-249",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12398,8 +18883,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-497",
+   "referenced_type" : "type-120",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12407,17 +18892,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-106",
-   "self_type" : "type-418",
+   "referenced_type" : "type-103",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2287",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-512",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12425,8 +18964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-508",
+   "referenced_type" : "type-571",
+   "self_type" : "type-1032",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12434,8 +18973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-236",
+   "referenced_type" : "type-793",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12443,8 +18982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &",
    "name" : "android::hardware::details::hidl_pointer<const char> &",
-   "referenced_type" : "type-98",
-   "self_type" : "type-317",
+   "referenced_type" : "type-39",
+   "self_type" : "type-86",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12452,8 +18991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-12",
-   "self_type" : "type-999",
+   "referenced_type" : "type-9",
+   "self_type" : "type-584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12461,8 +19000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-194",
-   "self_type" : "type-200",
+   "referenced_type" : "type-473",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12470,8 +19009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &",
    "name" : "android::hardware::details::return_status &",
-   "referenced_type" : "type-105",
-   "self_type" : "type-693",
+   "referenced_type" : "type-112",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12479,8 +19018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-516",
+   "referenced_type" : "type-972",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12488,8 +19027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &",
    "name" : "android::hardware::hidl_handle &",
-   "referenced_type" : "type-77",
-   "self_type" : "type-87",
+   "referenced_type" : "type-28",
+   "self_type" : "type-34",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12497,8 +19036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-201",
-   "self_type" : "type-226",
+   "referenced_type" : "type-60",
+   "self_type" : "type-64",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12506,8 +19045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-190",
+   "referenced_type" : "type-38",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12515,8 +19054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-439",
+   "referenced_type" : "type-968",
+   "self_type" : "type-977",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12524,8 +19063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-429",
+   "referenced_type" : "type-570",
+   "self_type" : "type-967",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12533,8 +19072,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-994",
+   "referenced_type" : "type-575",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12542,8 +19081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-206",
-   "self_type" : "type-208",
+   "referenced_type" : "type-472",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12551,17 +19090,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-246",
+   "referenced_type" : "type-502",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
+   "name" : "android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-425",
+   "self_type" : "type-3444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-72",
-   "self_type" : "type-888",
+   "referenced_type" : "type-383",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
+   "name" : "android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-444",
+   "self_type" : "type-3653",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12569,8 +19153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-161",
+   "referenced_type" : "type-744",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12578,8 +19162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-356",
-   "self_type" : "type-399",
+   "referenced_type" : "type-908",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12587,8 +19171,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-300",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12596,8 +19180,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-258",
-   "self_type" : "type-392",
+   "referenced_type" : "type-526",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12605,8 +19189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-395",
+   "referenced_type" : "type-542",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12614,8 +19198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-124",
+   "referenced_type" : "type-531",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12623,8 +19207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-548",
+   "self_type" : "type-1944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12632,8 +19216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-127",
-   "self_type" : "type-140",
+   "referenced_type" : "type-537",
+   "self_type" : "type-734",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12641,8 +19225,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-797",
-   "self_type" : "type-874",
+   "referenced_type" : "type-331",
+   "self_type" : "type-424",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-901",
+   "self_type" : "type-2216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
+   "name" : "android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-3567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12650,17 +19252,269 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-33",
-   "self_type" : "type-864",
+   "referenced_type" : "type-309",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "char *const &",
+   "name" : "char *const &",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3602",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[10]",
+   "name" : "char const (&)[10]",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3468",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[11]",
+   "name" : "char const (&)[11]",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3493",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[12]",
+   "name" : "char const (&)[12]",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3464",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[13]",
+   "name" : "char const (&)[13]",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3461",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[14]",
+   "name" : "char const (&)[14]",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3511",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[15]",
+   "name" : "char const (&)[15]",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[16]",
+   "name" : "char const (&)[16]",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3495",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[17]",
+   "name" : "char const (&)[17]",
+   "referenced_type" : "type-3512",
+   "self_type" : "type-3514",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[18]",
+   "name" : "char const (&)[18]",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[19]",
+   "name" : "char const (&)[19]",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3530",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[20]",
+   "name" : "char const (&)[20]",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3508",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[22]",
+   "name" : "char const (&)[22]",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3533",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[25]",
+   "name" : "char const (&)[25]",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[28]",
+   "name" : "char const (&)[28]",
+   "referenced_type" : "type-3543",
+   "self_type" : "type-3545",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[29]",
+   "name" : "char const (&)[29]",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3520",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[2]",
+   "name" : "char const (&)[2]",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[31]",
+   "name" : "char const (&)[31]",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3505",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[32]",
+   "name" : "char const (&)[32]",
+   "referenced_type" : "type-3534",
+   "self_type" : "type-3536",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[35]",
+   "name" : "char const (&)[35]",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[37]",
+   "name" : "char const (&)[37]",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3517",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[3]",
+   "name" : "char const (&)[3]",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3485",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[4]",
+   "name" : "char const (&)[4]",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3606",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[5]",
+   "name" : "char const (&)[5]",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3612",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[6]",
+   "name" : "char const (&)[6]",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[7]",
+   "name" : "char const (&)[7]",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3502",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[8]",
+   "name" : "char const (&)[8]",
+   "referenced_type" : "type-3486",
+   "self_type" : "type-3490",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[9]",
+   "name" : "char const (&)[9]",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-770",
-   "self_type" : "type-772",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12668,35 +19522,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-167",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1200",
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
+   "name" : "const android::hardware::BpHwBinder::Obituary &",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2227",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump &",
+   "name" : "const android::hardware::HexDump &",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-3712",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1540",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12704,8 +19567,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12713,8 +19576,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1783",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1987",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -12722,8 +19621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2040",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12731,8 +19630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2094",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -12740,8 +19639,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2367",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12749,8 +19657,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-473",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2922",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12758,8 +19666,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-588",
-   "self_type" : "type-590",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3004",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12767,8 +19675,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-646",
-   "self_type" : "type-648",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3060",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12776,17 +19684,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3124",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-316",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3175",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3224",
+   "self_type" : "type-3226",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3689",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1001",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
+   "name" : "const android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3643",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "type-459",
+   "self_type" : "type-952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12794,8 +19756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-109",
+   "referenced_type" : "type-715",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12803,17 +19765,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-413",
+   "referenced_type" : "type-107",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode &",
+   "name" : "const android::hardware::TypeCode &",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-3709",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-483",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12821,8 +19792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-11",
-   "self_type" : "type-76",
+   "referenced_type" : "type-8",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12830,8 +19801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-491",
+   "self_type" : "type-787",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12839,8 +19810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-80",
+   "referenced_type" : "type-31",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12848,8 +19819,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-222",
-   "self_type" : "type-223",
+   "referenced_type" : "type-62",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12857,8 +19828,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-141",
-   "self_type" : "type-151",
+   "referenced_type" : "type-47",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12866,8 +19837,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12875,8 +19846,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-573",
+   "self_type" : "type-1003",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12884,8 +19855,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-445",
-   "self_type" : "type-477",
+   "referenced_type" : "type-982",
+   "self_type" : "type-1004",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12893,8 +19864,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-995",
-   "self_type" : "type-997",
+   "referenced_type" : "type-580",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12902,8 +19873,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-922",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12911,8 +19882,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-292",
+   "referenced_type" : "type-73",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12920,8 +19891,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &",
    "name" : "const android::hidl::base::V1_0::IBase *const &",
-   "referenced_type" : "type-811",
-   "self_type" : "type-812",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12929,26 +19900,134 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-510",
+   "referenced_type" : "type-981",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
+   "name" : "const android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2170",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3289",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2336",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3387",
+   "self_type" : "type-3389",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3394",
+   "self_type" : "type-3396",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-439",
+   "self_type" : "type-694",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
+   "name" : "const android::sp<android::hardware::IInterface> &",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3405",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-117",
-   "self_type" : "type-123",
+   "referenced_type" : "type-719",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
+   "name" : "const android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-449",
+   "self_type" : "type-3430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12956,8 +20035,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-363",
+   "referenced_type" : "type-907",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12965,8 +20044,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-80",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12974,8 +20053,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-861",
-   "self_type" : "type-863",
+   "referenced_type" : "type-410",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12983,8 +20062,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "type-529",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12992,8 +20071,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-545",
+   "self_type" : "type-738",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13001,8 +20080,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "type-534",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13010,8 +20089,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-553",
+   "self_type" : "type-742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13019,8 +20098,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-540",
+   "self_type" : "type-727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13028,8 +20107,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-873",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1215",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13037,26 +20161,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1197",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1911",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-781",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3660",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13064,8 +20170,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-867",
-   "self_type" : "type-868",
+   "referenced_type" : "type-417",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13073,8 +20179,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-414",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13082,13 +20188,31 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-904",
-   "self_type" : "type-923",
+   "referenced_type" : "type-455",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const char &",
+   "name" : "const char &",
+   "referenced_type" : "type-42",
+   "self_type" : "type-2306",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *const &",
+   "name" : "const char *const &",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-5",
@@ -13098,10 +20222,19 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object &",
+   "name" : "const flat_binder_object &",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3582",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13109,227 +20242,332 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-441",
-   "self_type" : "type-992",
+   "referenced_type" : "type-568",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1065",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1122",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1198",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1303",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1373",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1505",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1545",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1612",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1682",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1843",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1898",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1958",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1836",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2030",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2076",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2126",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2348",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2451",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-202",
-   "self_type" : "type-204",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2521",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2644",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-237",
-   "self_type" : "type-245",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2684",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-271",
+   "self_type" : "type-273",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-419",
-   "self_type" : "type-422",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2782",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-624",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2821",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-752",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-85",
-   "self_type" : "type-88",
+   "referenced_type" : "type-2980",
+   "self_type" : "type-2982",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-917",
-   "self_type" : "type-919",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3037",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3095",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3163",
+   "self_type" : "type-3165",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3209",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3258",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3412",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3789",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3859",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-469",
+   "self_type" : "type-471",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-566",
+   "self_type" : "type-569",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-655",
+   "self_type" : "type-657",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-67",
+   "self_type" : "type-69",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-703",
+   "self_type" : "type-706",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-781",
+   "self_type" : "type-783",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-810",
+   "self_type" : "type-818",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-875",
+   "self_type" : "type-877",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-960",
+   "self_type" : "type-963",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-671",
-   "self_type" : "type-673",
+   "referenced_type" : "type-182",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13337,8 +20575,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-604",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13346,8 +20584,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-970",
-   "self_type" : "type-980",
+   "referenced_type" : "type-547",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13355,8 +20593,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-926",
-   "self_type" : "type-934",
+   "referenced_type" : "type-482",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13364,8 +20602,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1132",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13373,44 +20638,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1182",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1153",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1222",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1223",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13418,8 +20647,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13427,35 +20656,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1496",
+   "self_type" : "type-1546",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1548",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-165",
-   "self_type" : "type-176",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13463,8 +20674,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1682",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13472,8 +20692,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1852",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13481,8 +20701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1908",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13490,8 +20710,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1969",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -13499,8 +20746,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1941",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13508,17 +20755,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-89",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2012",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13526,8 +20764,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13535,8 +20773,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2685",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13544,8 +20782,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2730",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2770",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -13553,8 +20800,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2930",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13562,8 +20809,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-572",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2989",
+   "self_type" : "type-2991",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13571,8 +20818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
+   "referenced_type" : "type-3045",
+   "self_type" : "type-3047",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13580,8 +20827,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-819",
-   "self_type" : "type-821",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3106",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3180",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3221",
+   "self_type" : "type-3223",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-358",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13589,17 +20863,89 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-933",
+   "referenced_type" : "type-3730",
+   "self_type" : "type-3732",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3800",
+   "self_type" : "type-3802",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3877",
+   "self_type" : "type-3879",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-487",
+   "self_type" : "type-489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-52",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-598",
+   "self_type" : "type-600",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-648",
+   "self_type" : "type-707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-751",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13607,8 +20953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13616,8 +20962,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-3872",
+   "self_type" : "type-3871",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13625,8 +20980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13634,8 +20989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13643,8 +20998,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-353",
+   "self_type" : "type-352",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
+   "name" : "const std::function<sp<IBinder> (void *)> &",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13652,8 +21016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13661,8 +21025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2120",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13670,17 +21034,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-732",
-   "self_type" : "type-734",
+   "referenced_type" : "type-246",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3252",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3454",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "referenced_type" : "type-3577",
+   "self_type" : "type-3579",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1620",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13688,8 +21079,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-211",
-   "self_type" : "type-214",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2759",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-788",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13697,8 +21097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13706,8 +21106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13715,8 +21115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13724,8 +21124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13733,8 +21133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13742,8 +21142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13751,8 +21151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13760,8 +21160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13769,8 +21169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1551",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13778,44 +21178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1359",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1487",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13832,8 +21196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1663",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13841,8 +21205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13850,8 +21214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1761",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13859,8 +21223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1820",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13868,8 +21232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13877,8 +21241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1885",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13895,8 +21259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2033",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13904,8 +21268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13913,8 +21277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13922,8 +21286,161 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2548",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2664",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2690",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2719",
+   "self_type" : "type-2718",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2802",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2836",
+   "self_type" : "type-2835",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2959",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3007",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3025",
+   "self_type" : "type-3024",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3130",
+   "self_type" : "type-3129",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3244",
+   "self_type" : "type-3243",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3263",
+   "self_type" : "type-3262",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13940,8 +21457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "type-3716",
+   "self_type" : "type-3715",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13949,8 +21466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-517",
+   "referenced_type" : "type-3824",
+   "self_type" : "type-3823",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13958,8 +21475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-3887",
+   "self_type" : "type-3886",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13967,8 +21484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13976,8 +21493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-613",
-   "self_type" : "type-612",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13985,8 +21502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
+   "referenced_type" : "type-609",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13994,8 +21511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-804",
-   "self_type" : "type-803",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14003,8 +21520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14012,8 +21529,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-892",
+   "self_type" : "type-891",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-91",
+   "self_type" : "type-90",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14021,26 +21574,44 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-965",
+   "referenced_type" : "type-522",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned char *const &",
+   "name" : "const unsigned char *const &",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3539",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-677",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-189",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *const &",
+   "name" : "const unsigned int *const &",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3542",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-611",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14048,8 +21619,17 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-981",
-   "self_type" : "type-985",
+   "referenced_type" : "type-561",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const void *const &",
+   "name" : "const void *const &",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14057,8 +21637,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-760",
+   "referenced_type" : "type-14",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14066,17 +21646,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1154",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14084,8 +21655,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1603",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14093,8 +21664,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14102,8 +21673,26 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-203",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14111,19 +21700,91 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-3159",
+   "self_type" : "type-3158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3364",
+   "self_type" : "type-3363",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3613",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-775",
+   "self_type" : "type-774",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-945",
+   "referenced_type" : "type-146",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *const &",
+   "name" : "void *const &",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3481",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   }
  ],
  "pointer_types" :
@@ -14132,8 +21793,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CallStack *",
    "name" : "android::CallStack *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-686",
+   "referenced_type" : "type-197",
+   "self_type" : "type-198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14141,8 +21802,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CallStack::StackDeleter *",
    "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-690",
+   "referenced_type" : "type-201",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14150,17 +21811,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-849",
+   "referenced_type" : "type-395",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3346",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3657",
+   "self_type" : "type-3656",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-839",
-   "self_type" : "type-842",
+   "referenced_type" : "type-388",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14168,8 +21901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-845",
+   "referenced_type" : "type-392",
+   "self_type" : "type-394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14177,8 +21910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-853",
+   "referenced_type" : "type-399",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14186,8 +21919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14195,8 +21928,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-859",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14204,8 +21937,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-66",
+   "referenced_type" : "type-18",
+   "self_type" : "type-25",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase **",
+   "name" : "android::RefBase **",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const *",
+   "name" : "android::RefBase *const *",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1060",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14213,8 +21973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14222,8 +21982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14231,8 +21991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14240,8 +22000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14249,8 +22009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14258,8 +22018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14267,8 +22027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14276,8 +22036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14285,8 +22045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14294,8 +22054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14303,8 +22063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14312,8 +22072,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14321,8 +22081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14330,8 +22090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14339,8 +22099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14348,8 +22108,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-21",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14357,8 +22117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14366,8 +22126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14375,8 +22135,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1994",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14384,8 +22144,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14393,8 +22153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14402,8 +22162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14411,8 +22171,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14420,8 +22180,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14429,8 +22189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14438,8 +22198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14447,8 +22207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14456,8 +22216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14465,8 +22225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-912",
-   "self_type" : "type-911",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14474,8 +22234,242 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3033",
+   "self_type" : "type-3032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3091",
+   "self_type" : "type-3090",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3428",
+   "self_type" : "type-3427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3784",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3854",
+   "self_type" : "type-3853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-652",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-700",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-778",
+   "self_type" : "type-777",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14483,17 +22477,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-22",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type **",
+   "name" : "android::RefBase::weakref_type **",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const *",
+   "name" : "android::RefBase::weakref_type *const *",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-23",
+   "referenced_type" : "type-7",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14501,17 +22513,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-501",
-   "self_type" : "type-502",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-3635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2219",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-763",
-   "self_type" : "type-774",
+   "referenced_type" : "type-286",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14519,8 +22549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-660",
+   "referenced_type" : "type-165",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14528,17 +22558,125 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase *> *",
+   "name" : "android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3435",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Vector<android::String8> *",
    "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
+   "referenced_type" : "type-193",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-379",
+   "self_type" : "type-3431",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3456",
+   "self_type" : "type-3455",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-377",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14546,8 +22684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-509",
+   "referenced_type" : "type-126",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -14555,6 +22693,24 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1043",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
    "referenced_type" : "type-1227",
    "self_type" : "type-1226",
    "size" : 4,
@@ -14564,8 +22720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14573,8 +22729,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2709",
+   "self_type" : "type-2708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14582,8 +22819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-2842",
+   "self_type" : "type-2841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14591,8 +22828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-2854",
+   "self_type" : "type-2853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14600,8 +22837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-2963",
+   "self_type" : "type-2962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14609,8 +22846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14618,8 +22855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-3067",
+   "self_type" : "type-3066",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14627,8 +22864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14636,8 +22873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-3196",
+   "self_type" : "type-3195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14645,8 +22882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14654,8 +22891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14663,8 +22900,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "type-737",
+   "self_type" : "type-736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14672,35 +22918,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-915",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "linker_set_key" : "android::hardware::BHwBinder **",
+   "name" : "android::hardware::BHwBinder **",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-3411",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "linker_set_key" : "android::hardware::BHwBinder *const *",
+   "name" : "android::hardware::BHwBinder *const *",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3416",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder *",
+   "name" : "android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
+   "name" : "android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2236",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwRefBase *",
+   "name" : "android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2181",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput *",
+   "name" : "android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2317",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-39",
+   "referenced_type" : "type-664",
+   "self_type" : "type-667",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14708,8 +23062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-46",
+   "referenced_type" : "type-670",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14717,8 +23071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-806",
+   "referenced_type" : "type-326",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14726,8 +23080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-587",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14735,8 +23089,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-825",
+   "referenced_type" : "type-347",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14744,17 +23098,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump *",
+   "name" : "android::hardware::HexDump *",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::HidlMemory *",
    "name" : "android::hardware::HidlMemory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14762,8 +23125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14771,8 +23134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,8 +23143,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14789,8 +23152,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14798,8 +23161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14807,8 +23170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14816,8 +23179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14825,8 +23188,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14834,8 +23197,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14843,8 +23206,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14852,8 +23215,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14861,8 +23224,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1933",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14870,8 +23233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14879,8 +23242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14888,8 +23251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14897,8 +23260,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14906,8 +23269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14915,8 +23278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14924,8 +23287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-345",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14933,8 +23296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14942,8 +23305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14951,8 +23314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2844",
+   "self_type" : "type-2843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14960,8 +23323,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14969,8 +23332,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "type-2966",
+   "self_type" : "type-2965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14978,8 +23341,134 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3143",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3199",
+   "self_type" : "type-3198",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3828",
+   "self_type" : "type-3827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-385",
+   "self_type" : "type-384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-615",
+   "self_type" : "type-614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14987,8 +23476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14996,8 +23485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15005,8 +23494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15014,8 +23503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15023,8 +23512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1873",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15032,8 +23521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15041,8 +23530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15050,8 +23539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15059,8 +23548,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2192",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2846",
+   "self_type" : "type-2845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3011",
+   "self_type" : "type-3010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3013",
+   "self_type" : "type-3012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3133",
+   "self_type" : "type-3132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3248",
+   "self_type" : "type-3247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-903",
+   "self_type" : "type-902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15068,8 +23620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15077,8 +23629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15086,8 +23638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1725",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15095,8 +23647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15104,8 +23656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15113,8 +23665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15122,8 +23674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2010",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15131,8 +23683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15140,17 +23692,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-3407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2967",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3021",
+   "self_type" : "type-3020",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3075",
+   "self_type" : "type-3074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3147",
+   "self_type" : "type-3146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IPCThreadState *",
+   "name" : "android::hardware::IPCThreadState *",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-3448",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-930",
+   "referenced_type" : "type-484",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -15158,8 +23782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15167,17 +23791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1544",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15185,8 +23800,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15194,8 +23809,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1922",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15203,8 +23854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15212,8 +23863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15221,8 +23872,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15230,8 +23890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2926",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15239,8 +23899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3005",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15248,8 +23908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15257,8 +23917,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3228",
+   "self_type" : "type-3227",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15266,8 +23962,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15275,8 +23971,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-2699",
+   "self_type" : "type-2698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PassthroughServiceManager *",
+   "name" : "android::hardware::PassthroughServiceManager *",
+   "referenced_type" : "type-722",
+   "self_type" : "type-721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PoolThread *",
+   "name" : "android::hardware::PoolThread *",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15284,8 +23998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15293,8 +24007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15302,8 +24016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15311,8 +24025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15320,8 +24034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15329,8 +24043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15338,8 +24052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15347,8 +24061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15356,8 +24070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15365,8 +24079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15374,8 +24088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15383,8 +24097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15392,8 +24106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2809",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15401,17 +24115,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2970",
+   "self_type" : "type-2969",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3022",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3077",
+   "self_type" : "type-3076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3149",
+   "self_type" : "type-3148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3203",
+   "self_type" : "type-3202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-446",
+   "self_type" : "type-445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
+   "name" : "android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3619",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-765",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15419,8 +24223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-174",
+   "referenced_type" : "type-758",
+   "self_type" : "type-759",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15428,8 +24232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-945",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15437,8 +24241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15446,8 +24250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15455,8 +24259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15464,8 +24268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15473,8 +24277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-736",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15482,8 +24286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-488",
+   "referenced_type" : "type-120",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15491,17 +24295,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-407",
+   "referenced_type" : "type-103",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2292",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput *",
+   "name" : "android::hardware::TextOutput *",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-3708",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
+   "name" : "android::hardware::TextOutput::Bundle *",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TypeCode *",
+   "name" : "android::hardware::TypeCode *",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2294",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1273",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15509,8 +24349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15518,8 +24358,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-972",
+   "referenced_type" : "type-3846",
+   "self_type" : "type-3845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
+   "name" : "android::hardware::details::ClientCounterCallback *",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15527,8 +24376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-51",
+   "referenced_type" : "type-674",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15536,8 +24385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-54",
+   "referenced_type" : "type-678",
+   "self_type" : "type-680",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15545,8 +24394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-361",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15554,8 +24403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-601",
+   "self_type" : "type-603",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15563,8 +24412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-826",
+   "referenced_type" : "type-364",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15572,8 +24421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-998",
+   "referenced_type" : "type-128",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15581,8 +24430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::TaskRunner *",
    "name" : "android::hardware::details::TaskRunner *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-726",
+   "referenced_type" : "type-208",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -15590,8 +24439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1381",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15599,8 +24448,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-149",
+   "referenced_type" : "type-2712",
+   "self_type" : "type-2711",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15608,8 +24466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-511",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15617,8 +24475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-507",
+   "referenced_type" : "type-571",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15626,8 +24484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-235",
+   "referenced_type" : "type-793",
+   "self_type" : "type-808",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15635,8 +24493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> *",
    "name" : "android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-314",
+   "referenced_type" : "type-39",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15644,8 +24502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-936",
+   "referenced_type" : "type-9",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15653,8 +24511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-473",
+   "self_type" : "type-776",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15662,8 +24520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-442",
+   "referenced_type" : "type-112",
+   "self_type" : "type-113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15671,8 +24529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15680,8 +24538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15689,8 +24547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-83",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15698,8 +24556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-78",
+   "referenced_type" : "type-28",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15707,8 +24565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-201",
-   "self_type" : "type-213",
+   "referenced_type" : "type-60",
+   "self_type" : "type-61",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15716,8 +24574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-122",
+   "referenced_type" : "type-38",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15725,8 +24583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-436",
+   "referenced_type" : "type-968",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15734,8 +24592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-570",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15743,8 +24601,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-221",
+   "referenced_type" : "type-792",
+   "self_type" : "type-796",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15752,8 +24610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-990",
-   "self_type" : "type-993",
+   "referenced_type" : "type-575",
+   "self_type" : "type-578",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15761,8 +24619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-205",
+   "referenced_type" : "type-472",
+   "self_type" : "type-784",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15770,8 +24628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-265",
+   "referenced_type" : "type-70",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15779,8 +24637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-776",
+   "referenced_type" : "type-299",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15788,8 +24646,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "type-368",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15797,8 +24655,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15806,8 +24664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15815,8 +24673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-260",
+   "referenced_type" : "type-828",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
@@ -15824,8 +24682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-247",
-   "self_type" : "type-248",
+   "referenced_type" : "type-820",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15833,8 +24691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-371",
+   "referenced_type" : "type-830",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15842,8 +24700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-394",
+   "referenced_type" : "type-822",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15851,8 +24709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-370",
+   "referenced_type" : "type-917",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15860,8 +24718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-528",
-   "self_type" : "type-529",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15869,8 +24727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-259",
+   "referenced_type" : "type-504",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15878,8 +24736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "type-502",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15887,8 +24745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
+   "referenced_type" : "type-495",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15896,8 +24754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-837",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15905,8 +24763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-605",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15914,8 +24772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
    "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-604",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15923,8 +24781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
    "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15932,8 +24790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-277",
-   "self_type" : "type-278",
+   "referenced_type" : "type-846",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15941,8 +24799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-285",
+   "referenced_type" : "type-803",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
@@ -15950,8 +24808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-848",
+   "self_type" : "type-1931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15959,8 +24817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-139",
+   "referenced_type" : "type-729",
+   "self_type" : "type-733",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15968,8 +24826,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
    "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15977,8 +24835,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
    "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15986,8 +24844,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
    "name" : "android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-498",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15995,8 +24853,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "type-517",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Thread> *",
+   "name" : "android::sp<android::Thread> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-3632",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16004,17 +24889,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-875",
-   "self_type" : "type-905",
+   "referenced_type" : "type-425",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> *",
    "name" : "android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-366",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16022,8 +24916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-380",
+   "referenced_type" : "type-922",
+   "self_type" : "type-924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16031,8 +24925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-885",
+   "referenced_type" : "type-383",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16040,8 +24934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-157",
+   "referenced_type" : "type-720",
+   "self_type" : "type-743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16049,8 +24943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-893",
-   "self_type" : "type-897",
+   "referenced_type" : "type-444",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16058,8 +24952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-977",
+   "referenced_type" : "type-555",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16067,8 +24961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16076,8 +24970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-397",
+   "referenced_type" : "type-908",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16085,8 +24979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-304",
-   "self_type" : "type-878",
+   "referenced_type" : "type-81",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16094,8 +24988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-883",
+   "referenced_type" : "type-300",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16103,8 +24997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-961",
+   "referenced_type" : "type-526",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16112,8 +25006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-968",
+   "referenced_type" : "type-542",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16121,8 +25015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-963",
+   "referenced_type" : "type-531",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16130,8 +25024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-971",
+   "referenced_type" : "type-548",
+   "self_type" : "type-550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16139,8 +25033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-127",
-   "self_type" : "type-966",
+   "referenced_type" : "type-537",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16148,8 +25042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-797",
-   "self_type" : "type-871",
+   "referenced_type" : "type-331",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16157,8 +25051,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-354",
+   "referenced_type" : "type-901",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
+   "name" : "android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16166,8 +25069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-866",
+   "referenced_type" : "type-307",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16175,8 +25078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-857",
+   "referenced_type" : "type-309",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16184,17 +25087,35 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-719",
+   "referenced_type" : "type-229",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2243",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-3590",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-450",
+   "referenced_type" : "type-43",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16202,17 +25123,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CallStack *",
    "name" : "const android::CallStack *",
-   "referenced_type" : "type-687",
-   "self_type" : "type-688",
+   "referenced_type" : "type-199",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2231",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-755",
-   "self_type" : "type-756",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -16220,17 +25159,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-63",
+   "referenced_type" : "type-23",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-771",
+   "referenced_type" : "type-293",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16238,17 +25195,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-657",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase *> *",
+   "name" : "const android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-3440",
+   "self_type" : "type-3441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-3436",
+   "self_type" : "type-3437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-684",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-3432",
+   "self_type" : "type-3433",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2333",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16256,17 +25276,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-679",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BHwBinder *",
+   "name" : "const android::hardware::BHwBinder *",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2174",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder *",
+   "name" : "const android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2185",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
+   "name" : "const android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2204",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2238",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2183",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
+   "name" : "const android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2321",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-486",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16274,8 +25348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-489",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1016",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16283,8 +25357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-809",
-   "self_type" : "type-810",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16292,8 +25366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-596",
+   "self_type" : "type-597",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16301,17 +25375,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-816",
-   "self_type" : "type-818",
+   "referenced_type" : "type-355",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump *",
+   "name" : "const android::hardware::HexDump *",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16319,8 +25402,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2143",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16328,17 +25420,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-892",
+   "referenced_type" : "type-3774",
+   "self_type" : "type-3776",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-441",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
+   "name" : "const android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IInterface *",
+   "name" : "const android::hardware::IInterface *",
+   "referenced_type" : "type-3409",
+   "self_type" : "type-3410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IPCThreadState *",
+   "name" : "const android::hardware::IPCThreadState *",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3451",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel *",
+   "name" : "const android::hardware::Parcel *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-3576",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState *",
+   "name" : "const android::hardware::ProcessState *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
+   "name" : "const android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-187",
+   "referenced_type" : "type-769",
+   "self_type" : "type-770",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16346,8 +25501,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-763",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16355,8 +25510,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-408",
+   "referenced_type" : "type-949",
+   "self_type" : "type-951",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16364,8 +25519,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16373,8 +25528,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-620",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16382,8 +25537,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1951",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16391,8 +25546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16400,8 +25555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-908",
+   "referenced_type" : "type-459",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16409,17 +25564,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-412",
-   "self_type" : "type-421",
+   "referenced_type" : "type-107",
+   "self_type" : "type-111",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode *",
+   "name" : "const android::hardware::TypeCode *",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2296",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1389",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16427,8 +25591,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-171",
+   "referenced_type" : "type-2725",
+   "self_type" : "type-2727",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-755",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16436,8 +25609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1038",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16445,8 +25618,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-606",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16454,8 +25627,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-240",
+   "referenced_type" : "type-812",
+   "self_type" : "type-813",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16463,8 +25636,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char> *",
    "name" : "const android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-332",
+   "referenced_type" : "type-88",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16472,8 +25645,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-130",
+   "referenced_type" : "type-8",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16481,8 +25654,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-935",
+   "referenced_type" : "type-491",
+   "self_type" : "type-492",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16490,8 +25663,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-455",
-   "self_type" : "type-469",
+   "referenced_type" : "type-115",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16499,8 +25672,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16508,8 +25681,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-881",
-   "self_type" : "type-882",
+   "referenced_type" : "type-431",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16517,8 +25690,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle *",
    "name" : "const android::hardware::hidl_handle *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-93",
+   "referenced_type" : "type-31",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16526,8 +25699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-222",
-   "self_type" : "type-234",
+   "referenced_type" : "type-62",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16535,8 +25708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-189",
+   "referenced_type" : "type-47",
+   "self_type" : "type-56",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16544,8 +25717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2085",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16553,8 +25726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-989",
+   "referenced_type" : "type-573",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16562,8 +25735,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-982",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16571,8 +25744,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-996",
+   "referenced_type" : "type-580",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16580,8 +25753,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-920",
-   "self_type" : "type-921",
+   "referenced_type" : "type-476",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16589,8 +25762,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-287",
+   "referenced_type" : "type-73",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16598,8 +25771,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-372",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -16607,8 +25780,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16616,8 +25789,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-266",
-   "self_type" : "type-267",
+   "referenced_type" : "type-835",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -16625,8 +25798,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-256",
+   "referenced_type" : "type-826",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -16634,8 +25807,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-942",
-   "self_type" : "type-943",
+   "referenced_type" : "type-503",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -16643,8 +25816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16652,8 +25825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-938",
+   "referenced_type" : "type-494",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16661,8 +25834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-843",
+   "self_type" : "type-844",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -16670,8 +25843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-951",
-   "self_type" : "type-952",
+   "referenced_type" : "type-513",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -16679,8 +25852,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-284",
+   "referenced_type" : "type-852",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -16688,8 +25861,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-855",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -16697,8 +25870,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-939",
-   "self_type" : "type-940",
+   "referenced_type" : "type-497",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -16706,17 +25879,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-954",
+   "referenced_type" : "type-516",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::Thread> *",
+   "name" : "const android::sp<android::Thread> *",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
+   "name" : "const android::sp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory> *",
    "name" : "const android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-390",
+   "referenced_type" : "type-100",
+   "self_type" : "type-101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16724,8 +25951,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-889",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
+   "name" : "const android::sp<android::hardware::IInterface> *",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16733,8 +25969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-898",
-   "self_type" : "type-899",
+   "referenced_type" : "type-449",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16742,8 +25978,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-979",
+   "referenced_type" : "type-558",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16751,8 +25987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-167",
-   "self_type" : "type-168",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16760,8 +25996,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-400",
+   "referenced_type" : "type-907",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16769,8 +26005,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-303",
-   "self_type" : "type-393",
+   "referenced_type" : "type-80",
+   "self_type" : "type-102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16778,8 +26014,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-861",
-   "self_type" : "type-884",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16787,8 +26023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-299",
-   "self_type" : "type-962",
+   "referenced_type" : "type-529",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16796,8 +26032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-969",
+   "referenced_type" : "type-545",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16805,8 +26041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-964",
+   "referenced_type" : "type-534",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16814,8 +26050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-974",
+   "referenced_type" : "type-553",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16823,8 +26059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-967",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16832,8 +26068,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-877",
+   "referenced_type" : "type-422",
+   "self_type" : "type-427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
+   "name" : "const android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16841,8 +26095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-867",
-   "self_type" : "type-869",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16850,17 +26104,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-865",
+   "referenced_type" : "type-414",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const binder_buffer_object *",
+   "name" : "const binder_buffer_object *",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16868,8 +26131,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16877,8 +26140,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-116",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16886,8 +26149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16895,17 +26158,35 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2971",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-996",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object *",
+   "name" : "const flat_binder_object *",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3593",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-568",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16913,8 +26194,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-671",
-   "self_type" : "type-672",
+   "referenced_type" : "type-182",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16922,35 +26203,89 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const native_handle **",
+   "name" : "const native_handle **",
+   "referenced_type" : "type-11",
+   "self_type" : "type-3595",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-522",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *",
+   "name" : "const unsigned int *",
+   "referenced_type" : "type-189",
+   "self_type" : "type-3541",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const unsigned long long *",
+   "name" : "const unsigned long long *",
+   "referenced_type" : "type-611",
+   "self_type" : "type-2165",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-300",
+   "referenced_type" : "type-76",
+   "self_type" : "type-78",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void **",
+   "name" : "const void **",
+   "referenced_type" : "type-78",
+   "self_type" : "type-3594",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "double *",
+   "name" : "double *",
+   "referenced_type" : "type-6",
+   "self_type" : "type-3589",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "float *",
+   "name" : "float *",
+   "referenced_type" : "type-237",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-728",
-   "self_type" : "type-729",
+   "referenced_type" : "type-242",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16958,8 +26293,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-196",
+   "referenced_type" : "type-14",
+   "self_type" : "type-475",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16967,26 +26302,71 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-668",
-   "self_type" : "type-674",
+   "referenced_type" : "type-179",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long *",
+   "name" : "long long *",
+   "referenced_type" : "type-336",
+   "self_type" : "type-3587",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-90",
+   "referenced_type" : "type-13",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "short *",
+   "name" : "short *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-3584",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-3583",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2305",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1710",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16994,8 +26374,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2850",
+   "self_type" : "type-2849",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17003,8 +26383,17 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-361",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17012,8 +26401,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-716",
+   "referenced_type" : "type-146",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -17021,17 +26410,62 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-474",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "unsigned long long *",
+   "name" : "unsigned long long *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short *",
+   "name" : "unsigned short *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-3585",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(const void *, void *, void *)",
+   "name" : "void (*)(const void *, void *, void *)",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const char *)",
+   "name" : "void (*)(void *, const char *)",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3398",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-676",
+   "referenced_type" : "type-77",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17039,8 +26473,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-676",
-   "self_type" : "type-731",
+   "referenced_type" : "type-188",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -17050,10 +26484,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase *const",
+   "name" : "android::RefBase *const",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1062",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17062,8 +26506,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17072,8 +26516,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17082,8 +26526,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17092,8 +26536,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17102,8 +26546,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17112,8 +26556,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17122,8 +26566,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17132,8 +26576,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17142,8 +26586,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17152,8 +26596,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17162,8 +26606,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17172,8 +26616,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17182,8 +26626,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17192,8 +26636,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17202,8 +26646,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17212,8 +26656,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1879",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17222,8 +26666,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-197",
-   "self_type" : "type-199",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17232,8 +26676,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17242,8 +26686,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17252,8 +26696,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2312",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17262,8 +26706,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-307",
-   "self_type" : "type-309",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17272,8 +26716,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17282,8 +26726,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-552",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17292,8 +26736,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17302,8 +26746,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-746",
-   "self_type" : "type-748",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17312,8 +26756,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7",
-   "self_type" : "type-9",
+   "referenced_type" : "type-265",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17322,8 +26766,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-81",
-   "self_type" : "type-83",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17332,8 +26776,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-911",
-   "self_type" : "type-913",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17342,28 +26786,628 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-982",
-   "self_type" : "type-984",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2817",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2891",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2979",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3321",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3391",
+   "self_type" : "type-3393",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3399",
+   "self_type" : "type-3402",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3427",
+   "self_type" : "type-3429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3566",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3692",
+   "self_type" : "type-3694",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-463",
+   "self_type" : "type-465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-562",
+   "self_type" : "type-564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-651",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-699",
+   "self_type" : "type-701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-777",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-871",
+   "self_type" : "type-873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-956",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_type *const",
+   "name" : "android::RefBase::weakref_type *const",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::BHwBinder *const",
+   "name" : "android::hardware::BHwBinder *const",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-3415",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2178",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "char *const",
+   "name" : "char *const",
+   "referenced_type" : "type-186",
+   "self_type" : "type-3601",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[10]",
+   "name" : "char const[10]",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[11]",
+   "name" : "char const[11]",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[12]",
+   "name" : "char const[12]",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[13]",
+   "name" : "char const[13]",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[14]",
+   "name" : "char const[14]",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[15]",
+   "name" : "char const[15]",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[16]",
+   "name" : "char const[16]",
+   "referenced_type" : "type-362",
+   "self_type" : "type-3494",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[17]",
+   "name" : "char const[17]",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[18]",
+   "name" : "char const[18]",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[19]",
+   "name" : "char const[19]",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3528",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[20]",
+   "name" : "char const[20]",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[22]",
+   "name" : "char const[22]",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[25]",
+   "name" : "char const[25]",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[28]",
+   "name" : "char const[28]",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[29]",
+   "name" : "char const[29]",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[2]",
+   "name" : "char const[2]",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[31]",
+   "name" : "char const[31]",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[32]",
+   "name" : "char const[32]",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[35]",
+   "name" : "char const[35]",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[37]",
+   "name" : "char const[37]",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[3]",
+   "name" : "char const[3]",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[4]",
+   "name" : "char const[4]",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[5]",
+   "name" : "char const[5]",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3610",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[6]",
+   "name" : "char const[6]",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3473",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[7]",
+   "name" : "char const[7]",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[8]",
+   "name" : "char const[8]",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[9]",
+   "name" : "char const[9]",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::CallStack",
    "name" : "const android::CallStack",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "type-197",
+   "self_type" : "type-199",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3645",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2230",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-742",
-   "self_type" : "type-755",
+   "referenced_type" : "type-257",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -17372,18 +27416,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-55",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-375",
+   "self_type" : "type-3636",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2220",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-763",
-   "self_type" : "type-770",
+   "referenced_type" : "type-286",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17392,18 +27456,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
+   "referenced_type" : "type-165",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase *>",
+   "name" : "const android::Vector<android::RefBase *>",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3440",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
+   "name" : "const android::Vector<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3436",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-683",
+   "referenced_type" : "type-193",
+   "self_type" : "type-195",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
+   "name" : "const android::Vector<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-379",
+   "self_type" : "type-3432",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2225",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-377",
+   "self_type" : "type-3640",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2332",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<int>",
+   "name" : "const android::Vector<int>",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2325",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17412,18 +27546,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-675",
-   "self_type" : "type-678",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BHwBinder",
+   "name" : "const android::hardware::BHwBinder",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2173",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder",
+   "name" : "const android::hardware::BpHwBinder",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2184",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
+   "name" : "const android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2203",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2237",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2210",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2182",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput",
+   "name" : "const android::hardware::BufferedTextOutput",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2320",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
-   "referenced_type" : "type-30",
-   "self_type" : "type-485",
+   "referenced_type" : "type-664",
+   "self_type" : "type-1012",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17432,8 +27636,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
-   "referenced_type" : "type-42",
-   "self_type" : "type-487",
+   "referenced_type" : "type-670",
+   "self_type" : "type-1014",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17442,8 +27646,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
-   "referenced_type" : "type-792",
-   "self_type" : "type-809",
+   "referenced_type" : "type-326",
+   "self_type" : "type-343",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17452,8 +27656,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-587",
+   "self_type" : "type-596",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17462,18 +27666,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
-   "referenced_type" : "type-321",
-   "self_type" : "type-816",
+   "referenced_type" : "type-347",
+   "self_type" : "type-355",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::HexDump",
+   "name" : "const android::hardware::HexDump",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2300",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17482,8 +27696,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2142",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2436",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17492,18 +27716,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-3775",
+   "self_type" : "type-3774",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-442",
+   "self_type" : "type-441",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
+   "name" : "const android::hardware::IBinder::DeathRecipient",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2232",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IInterface",
+   "name" : "const android::hardware::IInterface",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-3409",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IPCThreadState",
+   "name" : "const android::hardware::IPCThreadState",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-3449",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17512,18 +27776,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 68,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1635",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17532,8 +27786,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17542,8 +27796,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1217",
+   "self_type" : "type-1216",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -17552,8 +27846,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17562,8 +27856,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -17572,8 +27866,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2166",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17582,8 +27886,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2920",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17592,8 +27896,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3002",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17602,8 +27906,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-3059",
+   "self_type" : "type-3058",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17612,18 +27916,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3672",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState",
+   "name" : "const android::hardware::ProcessState",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-3658",
+   "size" : 120,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
+   "name" : "const android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3621",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-186",
+   "referenced_type" : "type-765",
+   "self_type" : "type-769",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17632,8 +27996,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-172",
-   "self_type" : "type-178",
+   "referenced_type" : "type-758",
+   "self_type" : "type-763",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17642,8 +28006,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-406",
+   "referenced_type" : "type-945",
+   "self_type" : "type-949",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17652,8 +28016,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
-   "referenced_type" : "type-542",
-   "self_type" : "type-546",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1058",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17662,8 +28026,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
-   "referenced_type" : "type-615",
-   "self_type" : "type-619",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1115",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17672,8 +28036,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1950",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17682,8 +28046,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2020",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17692,8 +28056,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-410",
+   "referenced_type" : "type-249",
+   "self_type" : "type-459",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17702,8 +28066,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "type-120",
+   "self_type" : "type-715",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17712,18 +28076,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-106",
-   "self_type" : "type-412",
+   "referenced_type" : "type-103",
+   "self_type" : "type-107",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::TypeCode",
+   "name" : "const android::hardware::TypeCode",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2295",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-484",
+   "referenced_type" : "type-367",
+   "self_type" : "type-1011",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17732,8 +28106,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17742,8 +28116,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-2726",
+   "self_type" : "type-2725",
+   "size" : 52,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::Waiter",
+   "name" : "const android::hardware::details::Waiter",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17752,8 +28136,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-514",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1037",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17762,8 +28146,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-571",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17772,8 +28156,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-239",
+   "referenced_type" : "type-793",
+   "self_type" : "type-812",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17782,8 +28166,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char>",
    "name" : "const android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-319",
+   "referenced_type" : "type-39",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17792,8 +28176,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17802,8 +28186,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int>",
    "name" : "const android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-210",
+   "referenced_type" : "type-473",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17812,8 +28196,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-105",
-   "self_type" : "type-455",
+   "referenced_type" : "type-112",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17822,8 +28206,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32>",
    "name" : "const android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-972",
+   "self_type" : "type-2083",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17832,8 +28216,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-881",
+   "referenced_type" : "type-83",
+   "self_type" : "type-431",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17842,8 +28226,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-79",
+   "referenced_type" : "type-28",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17852,8 +28236,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-201",
-   "self_type" : "type-222",
+   "referenced_type" : "type-60",
+   "self_type" : "type-62",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17862,8 +28246,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-141",
+   "referenced_type" : "type-38",
+   "self_type" : "type-47",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17872,8 +28256,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-968",
+   "self_type" : "type-2084",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17882,8 +28266,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-476",
+   "referenced_type" : "type-570",
+   "self_type" : "type-573",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17892,8 +28276,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-445",
+   "referenced_type" : "type-792",
+   "self_type" : "type-982",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17902,8 +28286,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
-   "referenced_type" : "type-990",
-   "self_type" : "type-995",
+   "referenced_type" : "type-575",
+   "self_type" : "type-580",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17912,8 +28296,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-920",
+   "referenced_type" : "type-472",
+   "self_type" : "type-476",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17922,8 +28306,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-276",
+   "referenced_type" : "type-70",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17932,8 +28316,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase",
    "name" : "const android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-827",
+   "referenced_type" : "type-368",
+   "self_type" : "type-372",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -17942,8 +28326,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-758",
+   "referenced_type" : "type-280",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17952,8 +28336,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "referenced_type" : "type-302",
+   "self_type" : "type-330",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17962,8 +28346,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const",
    "name" : "const android::hidl::base::V1_0::IBase *const",
-   "referenced_type" : "type-795",
-   "self_type" : "type-811",
+   "referenced_type" : "type-329",
+   "self_type" : "type-345",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17972,8 +28356,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-266",
+   "referenced_type" : "type-830",
+   "self_type" : "type-835",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -17982,8 +28366,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-255",
+   "referenced_type" : "type-822",
+   "self_type" : "type-826",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -17992,8 +28376,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager",
    "name" : "const android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-942",
+   "referenced_type" : "type-504",
+   "self_type" : "type-503",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18002,8 +28386,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-444",
+   "referenced_type" : "type-502",
+   "self_type" : "type-981",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18012,8 +28396,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-941",
-   "self_type" : "type-946",
+   "referenced_type" : "type-501",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18022,8 +28406,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-944",
+   "referenced_type" : "type-500",
+   "self_type" : "type-506",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18032,8 +28416,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-937",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -18042,8 +28426,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-274",
+   "referenced_type" : "type-839",
+   "self_type" : "type-843",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -18052,8 +28436,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager",
    "name" : "const android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-951",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -18062,8 +28446,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-283",
+   "referenced_type" : "type-848",
+   "self_type" : "type-852",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -18072,8 +28456,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-131",
-   "self_type" : "type-286",
+   "referenced_type" : "type-729",
+   "self_type" : "type-855",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -18082,8 +28466,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback",
    "name" : "const android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-939",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -18092,28 +28476,138 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-953",
+   "referenced_type" : "type-517",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
-   "name" : "const android::sp<android::hardware::HidlMemory>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-383",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::Thread>",
+   "name" : "const android::sp<android::Thread>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-3639",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
+   "name" : "const android::sp<android::hardware::BHwBinder>",
+   "referenced_type" : "type-425",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2308",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
+   "name" : "const android::sp<android::hardware::HidlMemory>",
+   "referenced_type" : "type-93",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2168",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-922",
+   "self_type" : "type-2217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2334",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3388",
+   "self_type" : "type-3387",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-383",
+   "self_type" : "type-439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
+   "name" : "const android::sp<android::hardware::IInterface>",
+   "referenced_type" : "type-928",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18122,8 +28616,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18132,8 +28626,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-893",
-   "self_type" : "type-898",
+   "referenced_type" : "type-444",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18142,8 +28636,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-978",
+   "referenced_type" : "type-555",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18152,8 +28646,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter>",
    "name" : "const android::sp<android::hardware::details::Waiter>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-167",
+   "referenced_type" : "type-744",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18162,8 +28656,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18172,8 +28666,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-81",
+   "self_type" : "type-80",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18182,8 +28676,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-173",
-   "self_type" : "type-861",
+   "referenced_type" : "type-300",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18192,8 +28686,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
-   "referenced_type" : "type-258",
-   "self_type" : "type-299",
+   "referenced_type" : "type-526",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18202,8 +28696,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "type-542",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18212,8 +28706,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-116",
+   "referenced_type" : "type-531",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18222,8 +28716,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "type-548",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18232,8 +28726,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
+   "referenced_type" : "type-537",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18242,8 +28736,36 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-872",
+   "referenced_type" : "type-331",
+   "self_type" : "type-422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-901",
+   "self_type" : "type-2171",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1213",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-3562",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18251,24 +28773,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-3652",
+   "self_type" : "type-3651",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -18276,8 +28798,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient>",
    "name" : "const android::wp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-867",
+   "referenced_type" : "type-307",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18286,18 +28808,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-65",
+   "referenced_type" : "type-309",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const binder_buffer_object",
+   "name" : "const binder_buffer_object",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-904",
+   "referenced_type" : "type-29",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18306,18 +28838,28 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-101",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const char *const",
+   "name" : "const char *const",
+   "referenced_type" : "type-41",
+   "self_type" : "type-2289",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18326,8 +28868,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18336,8 +28878,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18346,8 +28888,18 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2917",
+   "size" : 276,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-997",
+   "self_type" : "type-996",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18364,10 +28916,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const flat_binder_object",
+   "name" : "const flat_binder_object",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-723",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-237",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18376,8 +28938,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-441",
+   "referenced_type" : "type-14",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18385,240 +28947,360 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1063",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1680",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1841",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1837",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-202",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2449",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2642",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2681",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "type-2750",
+   "self_type" : "type-2749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2775",
+   "self_type" : "type-2774",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-2894",
+   "self_type" : "type-2893",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2980",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-918",
-   "self_type" : "type-917",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3035",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-987",
-   "self_type" : "type-986",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3164",
+   "self_type" : "type-3163",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3208",
+   "self_type" : "type-3207",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-656",
+   "self_type" : "type-655",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-704",
+   "self_type" : "type-703",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18626,8 +29308,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-671",
+   "referenced_type" : "type-179",
+   "self_type" : "type-182",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18636,8 +29318,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-802",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-336",
+   "self_type" : "type-604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18646,8 +29328,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-13",
+   "self_type" : "type-12",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18656,8 +29338,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-970",
+   "referenced_type" : "type-151",
+   "self_type" : "type-547",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18666,8 +29348,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18676,8 +29358,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1070",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18686,8 +29368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18696,8 +29378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18706,8 +29388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18716,8 +29398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1316",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18726,8 +29408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18736,8 +29418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1548",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18746,8 +29428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18756,8 +29438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1684",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18766,8 +29448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1776",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18776,8 +29458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18786,8 +29468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1736",
+   "referenced_type" : "type-1905",
+   "self_type" : "type-1904",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18796,8 +29478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18806,8 +29488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18816,8 +29498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18826,8 +29508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18836,8 +29518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18846,8 +29528,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18856,8 +29538,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-224",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18866,8 +29548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18876,8 +29558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18886,8 +29568,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2765",
+   "self_type" : "type-2764",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18896,8 +29578,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2824",
+   "self_type" : "type-2823",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18906,8 +29588,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18916,8 +29598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-2916",
+   "self_type" : "type-2915",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18926,8 +29608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2987",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18936,8 +29618,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3043",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3101",
+   "self_type" : "type-3100",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3260",
+   "self_type" : "type-3259",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3796",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3869",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-481",
+   "self_type" : "type-480",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-880",
+   "self_type" : "type-879",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-995",
+   "self_type" : "type-994",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18946,8 +29768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1262",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18956,8 +29778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18966,8 +29788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18976,8 +29798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18986,8 +29808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18996,8 +29818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19006,8 +29828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19016,8 +29838,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1751",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19026,8 +29848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19036,8 +29858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19046,8 +29868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2028",
-   "self_type" : "type-2027",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19056,8 +29878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "type-2056",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19066,8 +29888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19076,8 +29898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19086,8 +29908,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2662",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19096,8 +29918,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19106,8 +29928,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-645",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2833",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19116,8 +29938,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2948",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3000",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3056",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3121",
+   "self_type" : "type-3120",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3191",
+   "self_type" : "type-3190",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3242",
+   "self_type" : "type-3241",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-685",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-817",
+   "self_type" : "type-816",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19126,8 +30048,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19136,8 +30058,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19146,8 +30068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19156,8 +30078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19166,8 +30088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1562",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19176,8 +30098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19186,8 +30108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1692",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19196,8 +30118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1750",
-   "self_type" : "type-1749",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19206,8 +30128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19216,8 +30138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1867",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19226,8 +30148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19236,8 +30158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19246,8 +30168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19256,8 +30178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2477",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19266,8 +30188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-2661",
+   "self_type" : "type-2660",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19276,8 +30198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2779",
+   "self_type" : "type-2778",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19286,8 +30208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19296,8 +30218,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-2947",
+   "self_type" : "type-2946",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2999",
+   "self_type" : "type-2998",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3118",
+   "self_type" : "type-3117",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3189",
+   "self_type" : "type-3188",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3240",
+   "self_type" : "type-3239",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3816",
+   "self_type" : "type-3815",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-510",
+   "self_type" : "type-509",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-683",
+   "self_type" : "type-682",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-815",
+   "self_type" : "type-814",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19306,8 +30328,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19316,48 +30368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1151",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19366,8 +30378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19376,38 +30388,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1546",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19416,8 +30408,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1683",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1789",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19426,8 +30428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19436,8 +30438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1906",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19446,8 +30448,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1967",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2043",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -19456,8 +30478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1939",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19466,8 +30488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2010",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2462",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19476,8 +30498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2539",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19486,8 +30508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2635",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19496,8 +30518,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2769",
+   "self_type" : "type-2768",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -19506,6 +30538,106 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2929",
+   "self_type" : "type-2928",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2990",
+   "self_type" : "type-2989",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3105",
+   "self_type" : "type-3104",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3222",
+   "self_type" : "type-3221",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3801",
+   "self_type" : "type-3800",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 12,
@@ -19516,58 +30648,68 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-599",
+   "self_type" : "type-598",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-752",
+   "self_type" : "type-751",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19576,8 +30718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2534",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19586,8 +30728,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19596,8 +30748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19606,8 +30758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19616,8 +30768,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-814",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
+   "name" : "const std::function<sp<IBinder> (void *)>",
+   "referenced_type" : "type-3727",
+   "self_type" : "type-3726",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19626,8 +30788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1185",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -19636,8 +30798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -19646,128 +30808,248 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-247",
+   "self_type" : "type-246",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3453",
+   "self_type" : "type-3452",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1847",
+   "self_type" : "type-1846",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2904",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3040",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3099",
+   "self_type" : "type-3098",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-976",
+   "self_type" : "type-975",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
    "referenced_type" : "type-1760",
    "self_type" : "type-1759",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-733",
-   "self_type" : "type-732",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1677",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-630",
-   "self_type" : "type-629",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19776,8 +31058,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1844",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19786,8 +31068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19796,8 +31078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19806,8 +31088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19816,8 +31098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19826,8 +31108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-2899",
+   "self_type" : "type-2898",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19836,8 +31118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-2984",
+   "self_type" : "type-2983",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19846,8 +31128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19856,18 +31138,58 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
+   "referenced_type" : "type-3097",
+   "self_type" : "type-3096",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19876,8 +31198,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2756",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> >",
+   "name" : "const std::vector<int, std::allocator<int> >",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19886,8 +31218,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19896,8 +31228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19906,8 +31238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19916,8 +31248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19926,8 +31258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19936,8 +31268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19946,8 +31278,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19956,8 +31288,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1526",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19966,8 +31298,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19976,58 +31308,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1360",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1473",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20046,8 +31328,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20056,8 +31338,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20066,8 +31348,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20076,8 +31358,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20086,8 +31368,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20106,8 +31398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20116,8 +31408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20126,8 +31418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20136,8 +31428,178 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-291",
-   "self_type" : "type-290",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2131",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2486",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2691",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2720",
+   "self_type" : "type-2719",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2836",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2840",
+   "self_type" : "type-2839",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2960",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3008",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3026",
+   "self_type" : "type-3025",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3065",
+   "self_type" : "type-3064",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3194",
+   "self_type" : "type-3193",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20156,8 +31618,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3716",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20166,8 +31628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20176,8 +31638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-596",
-   "self_type" : "type-595",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20186,8 +31648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20196,8 +31658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20206,8 +31668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-610",
+   "self_type" : "type-609",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20216,8 +31678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20226,8 +31688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-714",
+   "self_type" : "type-713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20236,8 +31698,48 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20246,28 +31748,48 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-454",
+   "referenced_type" : "type-146",
+   "self_type" : "type-522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned char *const",
+   "name" : "const unsigned char *const",
+   "referenced_type" : "type-990",
+   "self_type" : "type-3538",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-677",
+   "referenced_type" : "type-44",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned int *const",
+   "name" : "const unsigned int *const",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3540",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-16",
+   "self_type" : "type-611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20276,8 +31798,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-981",
+   "referenced_type" : "type-71",
+   "self_type" : "type-561",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20285,38 +31807,121 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-295",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const void *const",
+   "name" : "const void *const",
+   "referenced_type" : "type-78",
+   "self_type" : "type-2198",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "void *const",
+   "name" : "void *const",
+   "referenced_type" : "type-188",
+   "self_type" : "type-3480",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 1,
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-860",
+   "referenced_type" : "type-29",
+   "self_type" : "type-409",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-14",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
   }
  ],
  "record_types" :
  [
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-2314"
+    },
+    {
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mFrameLines",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::CallStack",
    "name" : "android::CallStack",
    "record_kind" : "class",
-   "referenced_type" : "type-685",
-   "self_type" : "type-685",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStackE"
@@ -20325,27 +31930,37 @@
    "alignment" : 1,
    "linker_set_key" : "android::CallStack::StackDeleter",
    "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-689",
-   "self_type" : "type-689",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::CompileTimeAssert<true>",
+   "name" : "android::CompileTimeAssert<true>",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3615",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Debug.h",
+   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -20357,17 +31972,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-375"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-763", "type-72" ],
+   "template_args" : [ "type-286", "type-383" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -20376,18 +31991,38 @@
    [
     {
      "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2154"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-742" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -20397,17 +32032,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -20417,14 +32052,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-389"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -20436,14 +32071,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-844"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -20453,7 +32088,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-255"
     }
    ],
    "fields" :
@@ -20462,20 +32097,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -20487,14 +32122,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-400"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -20506,14 +32141,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-855"
+     "referenced_type" : "type-404"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -20525,14 +32160,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-855"
+     "referenced_type" : "type-404"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -20545,14 +32180,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -20592,8 +32227,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -20603,8 +32238,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -20614,8 +32249,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-7",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -20641,14 +32276,14 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -20659,17 +32294,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-830",
-   "self_type" : "type-830",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-831" ],
+   "template_args" : [ "type-376" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -20716,14 +32351,72 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-675"
+     "access" : "private",
+     "referenced_type" : "type-192"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -20781,14 +32474,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-764"
+     "referenced_type" : "type-287"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -20800,14 +32493,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -20818,7 +32511,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -20827,62 +32520,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-455"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-839"
+     "referenced_type" : "type-388"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-846"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-860"
+     "referenced_type" : "type-409"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-860"
+     "referenced_type" : "type-409"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-901"
+     "referenced_type" : "type-452"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -20972,17 +32665,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -21027,17 +32720,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-36" ],
+   "template_args" : [ "type-308" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -21082,17 +32775,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -21137,17 +32830,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-798" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -21192,17 +32885,72 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-833" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -21243,38 +32991,148 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<int>",
+   "name" : "android::Vector<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6VectorIiEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-189"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-189"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -21326,14 +33184,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-124"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -21357,29 +33215,640 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3686",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286", "type-383" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 64,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlive",
+     "field_offset" : 96,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObitsSent",
+     "field_offset" : 128,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObituaries",
+     "field_offset" : 160,
+     "referenced_type" : "type-2150"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 192,
+     "referenced_type" : "type-2152"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mConstantData",
+     "field_offset" : 352,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDescriptorCache",
+     "field_offset" : 384,
+     "referenced_type" : "type-286"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder",
+   "name" : "android::hardware::BpHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2148",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 52,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "recipient",
+     "referenced_type" : "type-901"
+    },
+    {
+     "field_name" : "cookie",
+     "field_offset" : 64,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 96,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
+   "name" : "android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "referenced_type" : "type-2153"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
+   "name" : "android::hardware::BpHwBinder::ObjectManager",
+   "record_kind" : "class",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2152",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "object",
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "cleanupCookie",
+     "field_offset" : 32,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "func",
+     "field_offset" : 64,
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-2178"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-308"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2285"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mFlags",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSeq",
+     "field_offset" : 64,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIndex",
+     "field_offset" : 96,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mGlobalState",
+     "field_offset" : 160,
+     "referenced_type" : "type-2282"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BufferedTextOutput",
+   "name" : "android::hardware::BufferedTextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
+    }
+   ]
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-665"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-32"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-38" ],
+   "template_args" : [ "type-309", "type-367" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -21389,23 +33858,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-671"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-672"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-45" ],
+   "template_args" : [ "type-309", "type-29" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -21415,23 +33884,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-327"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-328"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-795", "type-797" ],
+   "template_args" : [ "type-329", "type-331" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -21441,23 +33910,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-329"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-330", "type-331" ],
+   "template_args" : [ "type-590", "type-591" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -21467,23 +33936,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-322"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-323"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-324", "type-325" ],
+   "template_args" : [ "type-350", "type-351" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -21492,50 +33961,99 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-78"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBytesPerLine",
+     "field_offset" : 64,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSingleLineCutoff",
+     "field_offset" : 96,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlignment",
+     "field_offset" : 128,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCArrayStyle",
+     "field_offset" : 160,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "linker_set_key" : "android::hardware::HexDump",
+   "name" : "android::hardware::HexDump",
+   "record_kind" : "class",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-60"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-349",
-   "self_type" : "type-349",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -21612,19 +34130,439 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-449"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-381"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-2160"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-2160"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-41"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-2247"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-2248"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-929"
+     "referenced_type" : "type-485"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -21636,42 +34574,409 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mQuantum",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-2161"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-230"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-2162"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-2163"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-44"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 32,
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 96,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-2251"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 224,
+     "referenced_type" : "type-336"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 288,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 320,
+     "referenced_type" : "type-377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 480,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 512,
+     "referenced_type" : "type-2243"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 544,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 576,
+     "referenced_type" : "type-382"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 736,
+     "referenced_type" : "type-165"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 768,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 776,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 800,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 832,
+     "referenced_type" : "type-189"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
+   "size" : 120,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 112,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2141"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21680,17 +34985,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "record_kind" : "class",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-765",
+   "self_type" : "type-765",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -21698,7 +35003,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21707,17 +35012,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-173" ],
+   "template_args" : [ "type-300" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -21725,7 +35030,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21734,17 +35039,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-258" ],
+   "template_args" : [ "type-526" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -21752,7 +35057,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21761,17 +35066,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-146" ],
+   "template_args" : [ "type-542" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -21779,7 +35084,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21788,17 +35093,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-111" ],
+   "template_args" : [ "type-531" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -21806,7 +35111,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21815,17 +35120,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1946",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-548" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -21833,7 +35138,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21842,17 +35147,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-127" ],
+   "template_args" : [ "type-537" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -21860,7 +35165,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21869,17 +35174,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -21887,17 +35192,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -21907,48 +35212,131 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput",
+   "name" : "android::hardware::TextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTO",
+     "referenced_type" : "type-2287"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TextOutput::Bundle",
+   "name" : "android::hardware::TextOutput::Bundle",
+   "record_kind" : "class",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCode",
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TypeCode",
+   "name" : "android::hardware::TypeCode",
+   "record_kind" : "class",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-30" ],
+   "template_args" : [ "type-664" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
   },
   {
@@ -21958,17 +35346,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-670" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
   },
   {
@@ -21978,17 +35366,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-326" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
   },
   {
@@ -21998,17 +35386,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-327" ],
+   "template_args" : [ "type-587" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
   },
   {
@@ -22018,17 +35406,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-321" ],
+   "template_args" : [ "type-347" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
   },
   {
@@ -22039,31 +35427,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-129"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-130"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-131"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -22092,18 +35480,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-367",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -22115,14 +35503,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -22131,8 +35519,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -22141,8 +35529,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -22151,8 +35539,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -22164,19 +35552,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-260"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -22188,19 +35576,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-795"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -22211,16 +35599,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-459"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22229,16 +35617,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-972" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22247,16 +35635,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-572"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-571",
+   "self_type" : "type-571",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -22265,16 +35653,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-794"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-793",
+   "self_type" : "type-793",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -22283,16 +35671,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-986"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -22302,19 +35690,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-186"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -22325,16 +35713,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-40"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -22344,19 +35732,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -22367,16 +35755,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-10"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-9",
+   "self_type" : "type-9",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -22386,19 +35774,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -22410,19 +35798,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-971"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -22434,19 +35822,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-572",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -22457,16 +35845,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -22476,19 +35864,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-475"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -22499,16 +35887,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-270"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-13" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -22518,19 +35906,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -22552,20 +35940,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-103"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -22574,11 +35962,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 32>",
    "name" : "android::hardware::details::std_array<unsigned char, 32>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-989",
+   "self_type" : "type-989",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -22588,16 +35976,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-973"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -22605,7 +35993,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-310"
     }
    ],
    "fields" :
@@ -22614,25 +36002,25 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-307"
     },
     {
      "access" : "private",
      "field_name" : "mCookie",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 160,
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -22712,13 +36100,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -22800,19 +36188,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-9"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -22824,25 +36212,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -22854,25 +36242,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -22884,28 +36272,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-258"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22915,28 +36303,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-969"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-972" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22946,28 +36334,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-425"
+     "referenced_type" : "type-571"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -22977,28 +36365,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-793"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-792",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -23008,28 +36396,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-985"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -23037,7 +36425,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-991"
+     "referenced_type" : "type-576"
     }
    ],
    "fields" :
@@ -23045,14 +36433,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "record_kind" : "class",
-   "referenced_type" : "type-990",
-   "self_type" : "type-990",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -23064,28 +36452,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -23095,19 +36483,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -23117,10 +36505,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23129,13 +36517,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 76,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BnHwBaseE",
@@ -23257,10 +36645,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-371"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23269,19 +36657,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-369"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-370"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE",
@@ -23464,10 +36852,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23476,19 +36864,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2062",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE",
@@ -23614,23 +37002,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-280"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -23641,13 +37029,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-302",
+   "self_type" : "type-302",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -23756,7 +37144,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23765,13 +37153,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE",
@@ -23893,7 +37281,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23902,13 +37290,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE",
@@ -24030,10 +37418,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-833"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24042,19 +37430,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-832"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE",
@@ -24261,10 +37649,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-825"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24273,19 +37661,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-823"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-824"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-822",
+   "self_type" : "type-822",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE",
@@ -24471,10 +37859,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-504"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24483,19 +37871,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE",
@@ -24644,10 +38032,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24656,19 +38044,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE",
@@ -24796,13 +38184,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE",
@@ -24944,33 +38332,33 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-472"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-280"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 64,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
@@ -24980,13 +38368,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -25099,7 +38487,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25108,13 +38496,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE",
@@ -25236,10 +38624,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-842"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25248,19 +38636,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-840"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE",
@@ -25470,10 +38858,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25482,19 +38870,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1099",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE",
@@ -25646,13 +39034,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-504"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE",
@@ -25797,7 +39185,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25806,13 +39194,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE",
@@ -25934,7 +39322,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25943,13 +39331,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE",
@@ -26071,10 +39459,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-851"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26083,19 +39471,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-849"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-281"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE",
@@ -26281,10 +39669,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26293,19 +39681,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-730"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-731"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE",
@@ -26530,10 +39918,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-498"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26542,19 +39930,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1929",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE",
@@ -26682,10 +40070,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-517"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26694,19 +40082,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2004",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE",
@@ -26873,13 +40261,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE",
@@ -26992,13 +40380,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-514"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE",
@@ -27163,19 +40551,65 @@
    "fields" :
    [
     {
+     "field_name" : "key",
+     "referenced_type" : "type-286"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-383"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3617",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286", "type-383" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "key",
+     "referenced_type" : "type-78"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-453"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-903" ],
+   "template_args" : [ "type-454" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -27185,17 +40619,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-426" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -27205,17 +40639,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-2282"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2284" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::HidlMemory>",
    "name" : "android::sp<android::hardware::HidlMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-349" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10HidlMemoryEEE"
   },
   {
@@ -27225,17 +40679,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-902"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-379" ],
+   "template_args" : [ "type-923" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -27245,17 +40699,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-384"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-386" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -27265,17 +40719,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-928",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-387" ],
+   "template_args" : [ "type-931" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -27285,17 +40739,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-121" ],
+   "template_args" : [ "type-723" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -27305,17 +40759,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-894"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-893",
-   "self_type" : "type-893",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-896" ],
+   "template_args" : [ "type-447" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -27325,17 +40779,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-972"
+     "referenced_type" : "type-551"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
+   "referenced_type" : "type-555",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-556" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -27345,17 +40799,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-739"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
    "name" : "android::sp<android::hardware::details::Waiter>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-745" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
   },
   {
@@ -27365,17 +40819,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-908",
+   "self_type" : "type-908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-306" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -27385,17 +40839,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-82"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -27405,17 +40859,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-300",
+   "self_type" : "type-300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -27425,17 +40879,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-504" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -27445,17 +40899,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-148" ],
+   "template_args" : [ "type-495" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -27465,17 +40919,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-514" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
   },
   {
@@ -27485,17 +40939,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -27505,47 +40959,322 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-127",
-   "self_type" : "type-127",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-517" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
+   "name" : "android::trait_pointer<android::RefBase *>",
+   "referenced_type" : "type-3558",
+   "self_type" : "type-3558",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3557",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::String16>",
+   "name" : "android::trait_pointer<android::String16>",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3680",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3555",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3678",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3679",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3681",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<const void *>",
+   "name" : "android::trait_pointer<const void *>",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<int>",
+   "name" : "android::trait_pointer<int>",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3706",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
+   "name" : "android::trait_trivial_copy<android::RefBase *>",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3551",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3550",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
+   "name" : "android::trait_trivial_copy<android::String16>",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3670",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3547",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3669",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3674",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3671",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<const void *>",
+   "name" : "android::trait_trivial_copy<const void *>",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27555,151 +41284,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-224",
+   "self_type" : "type-224",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase *>",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3496",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3484",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
+   "name" : "android::trait_trivial_ctor<android::String16>",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3663",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3472",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3661",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3662",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3664",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
+   "name" : "android::trait_trivial_ctor<const void *>",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27709,151 +41570,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase *>",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3546",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3537",
+   "self_type" : "type-3537",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
+   "name" : "android::trait_trivial_dtor<android::String16>",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3666",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3527",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3665",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3668",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3667",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
+   "name" : "android::trait_trivial_dtor<const void *>",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27863,173 +41856,294 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
+   "name" : "android::trait_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3554",
+   "self_type" : "type-3554",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3553",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-763" ],
+   "template_args" : [ "type-286" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3552",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3675",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3677",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3676",
+   "self_type" : "type-3676",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<const void *>",
+   "name" : "android::trait_trivial_move<const void *>",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28039,147 +42153,443 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-838",
-   "self_type" : "type-838",
+   "referenced_type" : "type-387",
+   "self_type" : "type-387",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-759",
-   "self_type" : "type-759",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-154",
+   "self_type" : "type-154",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase *>",
+   "name" : "android::traits<android::RefBase *>",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3561",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
+   "name" : "android::traits<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3560",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::String16>",
+   "name" : "android::traits<android::String16>",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3684",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
+   "name" : "android::traits<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3559",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3682",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3683",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3685",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<const void *>",
+   "name" : "android::traits<const void *>",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android6traitsIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<int>",
+   "name" : "android::traits<int>",
+   "referenced_type" : "type-3707",
+   "self_type" : "type-3707",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6traitsIiEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3426"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
+   "name" : "android::use_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3425",
+   "self_type" : "type-3425",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3424"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3423",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3422"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3421",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2208"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3625"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3624",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3627"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3626",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2206"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2344"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3688"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<int>",
+   "name" : "android::use_trivial_move<int>",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3687",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-800" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28189,23 +42599,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-902"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-901",
+   "self_type" : "type-901",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-353" ],
+   "template_args" : [ "type-905" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -28215,23 +42625,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-2141"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::hardware::IBinder>",
+   "name" : "android::wp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-2140" ],
+   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-82"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -28241,23 +42677,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-309",
+   "self_type" : "type-309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28266,18 +42702,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -28288,23 +42724,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-227"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -28315,23 +42751,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-231"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-719"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -28342,48 +42778,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-716"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-228"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -28394,38 +42830,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -28436,18 +42872,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -28458,43 +42894,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-227"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-226",
+   "self_type" : "type-226",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -28504,13 +42940,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -28521,35 +42957,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-181"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-177"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-665"
+     "referenced_type" : "type-176"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-663"
+     "referenced_type" : "type-174"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "record_kind" : "union",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
@@ -28560,18 +42996,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -28582,43 +43018,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -28629,48 +43065,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -28681,48 +43117,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -28733,53 +43169,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -28790,31 +43226,58 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lock",
+     "referenced_type" : "type-2323"
+    },
+    {
+     "field_name" : "has_tls",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "field_name" : "tls",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    }
+   ],
+   "linker_set_key" : "thread_store_t",
+   "name" : "thread_store_t",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
+   "size" : 12,
+   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
+   "unique_id" : "thread_store_t"
   }
  ],
  "rvalue_reference_types" :
@@ -28823,8 +43286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
-   "referenced_type" : "type-180",
-   "self_type" : "type-184",
+   "referenced_type" : "type-765",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28832,8 +43295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
-   "referenced_type" : "type-172",
-   "self_type" : "type-175",
+   "referenced_type" : "type-758",
+   "self_type" : "type-760",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28841,8 +43304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
-   "referenced_type" : "type-402",
-   "self_type" : "type-404",
+   "referenced_type" : "type-945",
+   "self_type" : "type-947",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28850,8 +43313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28859,8 +43322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
-   "referenced_type" : "type-615",
-   "self_type" : "type-617",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28868,8 +43331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28877,8 +43340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28886,8 +43349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-411",
-   "self_type" : "type-737",
+   "referenced_type" : "type-249",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28895,8 +43358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-104",
-   "self_type" : "type-494",
+   "referenced_type" : "type-120",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28904,8 +43367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-106",
-   "self_type" : "type-414",
+   "referenced_type" : "type-103",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28913,8 +43376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-38",
-   "self_type" : "type-41",
+   "referenced_type" : "type-367",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -28922,8 +43385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &&",
    "name" : "android::hardware::details::hidl_pointer<const char> &&",
-   "referenced_type" : "type-98",
-   "self_type" : "type-318",
+   "referenced_type" : "type-39",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -28931,8 +43394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-105",
-   "self_type" : "type-451",
+   "referenced_type" : "type-112",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28940,8 +43403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-77",
-   "self_type" : "type-84",
+   "referenced_type" : "type-28",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28949,8 +43412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-201",
-   "self_type" : "type-227",
+   "referenced_type" : "type-60",
+   "self_type" : "type-65",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28958,8 +43421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &&",
    "name" : "android::hardware::hidl_string &&",
-   "referenced_type" : "type-97",
-   "self_type" : "type-188",
+   "referenced_type" : "type-38",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28967,8 +43430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-206",
-   "self_type" : "type-207",
+   "referenced_type" : "type-472",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28976,8 +43439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-875",
-   "self_type" : "type-887",
+   "referenced_type" : "type-425",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28985,8 +43448,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> &&",
    "name" : "android::sp<android::hardware::HidlMemory> &&",
-   "referenced_type" : "type-347",
-   "self_type" : "type-377",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-922",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28994,8 +43466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-72",
-   "self_type" : "type-886",
+   "referenced_type" : "type-383",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29003,8 +43475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
-   "referenced_type" : "type-356",
-   "self_type" : "type-398",
+   "referenced_type" : "type-908",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29012,8 +43484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-304",
-   "self_type" : "type-879",
+   "referenced_type" : "type-81",
+   "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29021,8 +43493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-173",
-   "self_type" : "type-958",
+   "referenced_type" : "type-300",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29030,8 +43502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
-   "referenced_type" : "type-258",
-   "self_type" : "type-391",
+   "referenced_type" : "type-526",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29039,8 +43511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
-   "referenced_type" : "type-146",
-   "self_type" : "type-396",
+   "referenced_type" : "type-542",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29048,8 +43520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-531",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29057,8 +43529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-548",
+   "self_type" : "type-1943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29066,8 +43538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
-   "referenced_type" : "type-127",
-   "self_type" : "type-301",
+   "referenced_type" : "type-537",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29075,8 +43547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-797",
-   "self_type" : "type-808",
+   "referenced_type" : "type-331",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29084,8 +43556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-33",
-   "self_type" : "type-40",
+   "referenced_type" : "type-309",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29093,8 +43565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-795",
-   "self_type" : "type-807",
+   "referenced_type" : "type-329",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29102,8 +43574,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29111,8 +43583,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1075",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29120,8 +43592,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1686",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29129,8 +43601,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29138,8 +43610,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29147,8 +43619,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29156,8 +43628,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29165,8 +43637,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29174,8 +43646,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2938",
+   "self_type" : "type-2937",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2992",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3049",
+   "self_type" : "type-3048",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3109",
+   "self_type" : "type-3108",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3232",
+   "self_type" : "type-3231",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29183,8 +43709,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29192,8 +43718,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1626",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29201,8 +43727,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29210,8 +43736,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1747",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29219,8 +43745,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29228,8 +43754,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29237,8 +43763,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-1977",
+   "self_type" : "type-1976",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29246,8 +43772,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2050",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29255,8 +43781,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2942",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2996",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3052",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3114",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3236",
+   "self_type" : "type-3235",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29264,8 +43844,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29273,8 +43853,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1077",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29282,8 +43862,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1688",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29291,8 +43871,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29300,8 +43880,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29309,8 +43889,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29318,8 +43898,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29327,8 +43907,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29336,8 +43916,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2940",
+   "self_type" : "type-2939",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2995",
+   "self_type" : "type-2994",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3050",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3111",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3234",
+   "self_type" : "type-3233",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/29/64/x86/source-based/libhwbinder.so.lsdump b/29/64/x86/source-based/libhwbinder.so.lsdump
deleted file mode 100644
index b1b70eb..0000000
--- a/29/64/x86/source-based/libhwbinder.so.lsdump
+++ /dev/null
@@ -1,16791 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-158",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [10]",
-   "name" : "char [10]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-720",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [11]",
-   "name" : "char [11]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-742",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [12]",
-   "name" : "char [12]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-717",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [13]",
-   "name" : "char [13]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-713",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [14]",
-   "name" : "char [14]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-761",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [15]",
-   "name" : "char [15]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-122",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-745",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [17]",
-   "name" : "char [17]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-764",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [18]",
-   "name" : "char [18]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-749",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [19]",
-   "name" : "char [19]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-780",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [20]",
-   "name" : "char [20]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-758",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [22]",
-   "name" : "char [22]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-783",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [25]",
-   "name" : "char [25]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-773",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [28]",
-   "name" : "char [28]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-796",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [29]",
-   "name" : "char [29]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-770",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [2]",
-   "name" : "char [2]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-723",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [31]",
-   "name" : "char [31]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-755",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-786",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [35]",
-   "name" : "char [35]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-776",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [37]",
-   "name" : "char [37]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-767",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [3]",
-   "name" : "char [3]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-735",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4]",
-   "name" : "char [4]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [5]",
-   "name" : "char [5]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-125",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [6]",
-   "name" : "char [6]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-727",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [7]",
-   "name" : "char [7]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-752",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [8]",
-   "name" : "char [8]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-739",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [9]",
-   "name" : "char [9]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-730",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-95",
-   "self_type" : "type-228",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-10",
-   "self_type" : "type-84",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-66",
-   "self_type" : "type-167",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-4",
-   "self_type" : "type-216",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
-   "size" : 1
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char16_t",
-   "name" : "char16_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
-   "size" : 2
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel6removeEjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8growDataEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9initStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4dataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
-  },
-  {
-   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "getHWBinderKernelReferences"
-  },
-  {
-   "name" : "printHexData"
-  },
-  {
-   "name" : "printTypeCode"
-  },
-  {
-   "name" : "stringForIndent"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "name" : "_ZN7android8hardware12gTextBuffersE"
-  },
-  {
-   "name" : "_ZN7android8hardware13gProcessMutexE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aerrE"
-  },
-  {
-   "name" : "_ZN7android8hardware4alogE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aoutE"
-  },
-  {
-   "name" : "_ZN7android8hardware8gProcessE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10IInterfaceE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware12ProcessStateE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIiEE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10IInterfaceE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware10PoolThreadE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10TextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware12FdTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware12ProcessStateE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware13LogTextOutputE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String16::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String16::StaticLinkage",
-   "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
-   "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-10",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    }
-   ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-580",
-   "self_type" : "type-584",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-144"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-372",
-   "return_type" : "type-38",
-   "self_type" : "type-372",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-235",
-   "return_type" : "type-10",
-   "self_type" : "type-235",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-592"
-    }
-   ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-592",
-   "self_type" : "type-591",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-70",
-   "return_type" : "type-13",
-   "self_type" : "type-70",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (const void *, void *, void *)",
-   "name" : "void (const void *, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-13",
-   "self_type" : "type-280",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "referenced_type" : "type-648",
-   "return_type" : "type-13",
-   "self_type" : "type-648",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-543"
-    },
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-365",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-658"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-658"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-478"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-48",
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-507"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-650",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::sendObituary",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-517"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-818"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-661"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-654"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMaxThreads",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::startThreadPool",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-144"
-    },
-    {
-     "referenced_type" : "type-373"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-318",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setCallRestriction",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getKernelReferences",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::becomeContextManager",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-371"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-375",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-32",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::self",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
-   "return_type" : "type-701",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::clearCaller",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::stopProcess",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setupPolling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-705"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::flushCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearLastError",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::executeCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-705"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-538"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-93",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-705"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::self",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
-   "return_type" : "type-701",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::process",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::shutdown",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::transact",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::sendReply",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::release_object",
-   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-680"
-    },
-    {
-     "referenced_type" : "type-81"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
-   "return_type" : "type-608",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::print",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeFloat",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-95"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::finishWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeDouble",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeObject",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-81"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-819" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-91"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-68"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::restartWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeCString",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInplace",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::writePointer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::continueWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-282"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-373"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-78"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUnpadded",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::acquireObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::freeDataNoInit",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::releaseObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataCapacity",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeWeakBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-44"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeStrongBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
-   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::incrementNumReferences",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
-   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::write",
-   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::remove",
-   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::freeData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::growData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setError",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::initState",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBool",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-87"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-588"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-588"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-8",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-650",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::onTransact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-820"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-8",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-130",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-821"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "referenced_type" : "type-446"
-    }
-   ],
-   "return_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "referenced_type" : "type-443"
-    }
-   ],
-   "return_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-285"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-531"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::isContextManager",
-   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-385"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isServingCall",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
-   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-612"
-    }
-   ],
-   "return_type" : "type-575",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::clearCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::errorCheck",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::findBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-98"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-96"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-97",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-823" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-67"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-68",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::scanForFds",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcDataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readCString",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-103",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::updateCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataCapacity",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::objectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-634"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-281",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcBufferSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readWeakBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-32",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::quickFindBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::enforceInterface",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-658"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::verifyBufferObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-108"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16Inplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-282",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferChild",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferParent",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-658"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    },
-    {
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::data",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::read",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::print",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcData",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::objects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-74",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-86"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataAvail",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-94"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-95",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-705"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-92"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-93",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-65"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::checkSubclass",
-   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-640"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-127"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::getHWBinderKernelReferences",
-   "linker_set_key" : "getHWBinderKernelReferences",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printHexData",
-   "linker_set_key" : "printHexData",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-10"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printTypeCode",
-   "linker_set_key" : "printTypeCode",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::stringForIndent",
-   "linker_set_key" : "stringForIndent",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "global_vars" :
- [
-  {
-   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
-   "name" : "android::hardware::gTextBuffers",
-   "referenced_type" : "type-615",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
-   "name" : "android::hardware::gProcessMutex",
-   "referenced_type" : "type-242",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aerrE",
-   "name" : "android::hardware::aerr",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4alogE",
-   "name" : "android::hardware::alog",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aoutE",
-   "name" : "android::hardware::aout",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware8gProcessE",
-   "name" : "android::hardware::gProcess",
-   "referenced_type" : "type-824",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  }
- ],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-242",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-257",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const &",
-   "name" : "android::RefBase *const &",
-   "referenced_type" : "type-669",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const &",
-   "name" : "android::RefBase::weakref_type *const &",
-   "referenced_type" : "type-667",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 &",
-   "name" : "android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-561",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const &",
-   "name" : "android::hardware::BHwBinder *const &",
-   "referenced_type" : "type-665",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump &",
-   "name" : "android::hardware::HexDump &",
-   "referenced_type" : "type-448",
-   "self_type" : "type-589",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
-   "name" : "android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-319",
-   "self_type" : "type-352",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-440",
-   "self_type" : "type-580",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-315",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
-   "name" : "android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-538",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-574",
-   "self_type" : "type-599",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &",
-   "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
-   "name" : "android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
-   "name" : "android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *const &",
-   "name" : "char *const &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[10]",
-   "name" : "char const (&)[10]",
-   "referenced_type" : "type-719",
-   "self_type" : "type-721",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[11]",
-   "name" : "char const (&)[11]",
-   "referenced_type" : "type-741",
-   "self_type" : "type-743",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[12]",
-   "name" : "char const (&)[12]",
-   "referenced_type" : "type-716",
-   "self_type" : "type-718",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[13]",
-   "name" : "char const (&)[13]",
-   "referenced_type" : "type-712",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[14]",
-   "name" : "char const (&)[14]",
-   "referenced_type" : "type-760",
-   "self_type" : "type-762",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[15]",
-   "name" : "char const (&)[15]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[16]",
-   "name" : "char const (&)[16]",
-   "referenced_type" : "type-744",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[17]",
-   "name" : "char const (&)[17]",
-   "referenced_type" : "type-763",
-   "self_type" : "type-765",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[18]",
-   "name" : "char const (&)[18]",
-   "referenced_type" : "type-748",
-   "self_type" : "type-750",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[19]",
-   "name" : "char const (&)[19]",
-   "referenced_type" : "type-779",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[20]",
-   "name" : "char const (&)[20]",
-   "referenced_type" : "type-757",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[22]",
-   "name" : "char const (&)[22]",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[25]",
-   "name" : "char const (&)[25]",
-   "referenced_type" : "type-772",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[28]",
-   "name" : "char const (&)[28]",
-   "referenced_type" : "type-795",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[29]",
-   "name" : "char const (&)[29]",
-   "referenced_type" : "type-769",
-   "self_type" : "type-771",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[2]",
-   "name" : "char const (&)[2]",
-   "referenced_type" : "type-722",
-   "self_type" : "type-724",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[31]",
-   "name" : "char const (&)[31]",
-   "referenced_type" : "type-754",
-   "self_type" : "type-756",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[32]",
-   "name" : "char const (&)[32]",
-   "referenced_type" : "type-785",
-   "self_type" : "type-787",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[35]",
-   "name" : "char const (&)[35]",
-   "referenced_type" : "type-775",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[37]",
-   "name" : "char const (&)[37]",
-   "referenced_type" : "type-766",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[3]",
-   "name" : "char const (&)[3]",
-   "referenced_type" : "type-734",
-   "self_type" : "type-737",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[4]",
-   "name" : "char const (&)[4]",
-   "referenced_type" : "type-118",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[5]",
-   "name" : "char const (&)[5]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[6]",
-   "name" : "char const (&)[6]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-728",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[7]",
-   "name" : "char const (&)[7]",
-   "referenced_type" : "type-751",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[8]",
-   "name" : "char const (&)[8]",
-   "referenced_type" : "type-738",
-   "self_type" : "type-740",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[9]",
-   "name" : "char const (&)[9]",
-   "referenced_type" : "type-729",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-535",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
-   "name" : "const android::hardware::BpHwBinder::Obituary &",
-   "referenced_type" : "type-487",
-   "self_type" : "type-517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "referenced_type" : "type-494",
-   "self_type" : "type-495",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump &",
-   "name" : "const android::hardware::HexDump &",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-62",
-   "self_type" : "type-802",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
-   "name" : "const android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode &",
-   "name" : "const android::hardware::TypeCode &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-479",
-   "self_type" : "type-481",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
-   "name" : "const android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-711",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-5",
-   "self_type" : "type-30",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-505",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-196",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-211",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-625",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-647",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
-   "name" : "const android::sp<android::hardware::IInterface> &",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
-   "name" : "const android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char &",
-   "name" : "const char &",
-   "referenced_type" : "type-377",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const &",
-   "name" : "const char *const &",
-   "referenced_type" : "type-582",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-330",
-   "self_type" : "type-496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-239",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-269",
-   "self_type" : "type-638",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-168",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-133",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-474",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-706",
-   "self_type" : "type-708",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-291",
-   "self_type" : "type-293",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-76",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *const &",
-   "name" : "const unsigned char *const &",
-   "referenced_type" : "type-790",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-56",
-   "self_type" : "type-55",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *const &",
-   "name" : "const unsigned int *const &",
-   "referenced_type" : "type-792",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-476",
-   "self_type" : "type-477",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *const &",
-   "name" : "const void *const &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int &",
-   "name" : "int &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-619",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-429",
-   "self_type" : "type-428",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *const &",
-   "name" : "void *const &",
-   "referenced_type" : "type-732",
-   "self_type" : "type-733",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-803",
-   "self_type" : "type-804",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-807",
-   "self_type" : "type-808",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-382",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-250",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-256",
-   "self_type" : "type-260",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-262",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase **",
-   "name" : "android::RefBase **",
-   "referenced_type" : "type-23",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const *",
-   "name" : "android::RefBase *const *",
-   "referenced_type" : "type-669",
-   "self_type" : "type-670",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-160",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-642",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type **",
-   "name" : "android::RefBase::weakref_type **",
-   "referenced_type" : "type-20",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const *",
-   "name" : "android::RefBase::weakref_type *const *",
-   "referenced_type" : "type-667",
-   "self_type" : "type-668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-275",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-634",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase *> *",
-   "name" : "android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-685",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-681",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-512",
-   "self_type" : "type-514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-710",
-   "self_type" : "type-709",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-621",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-620",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-409",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder **",
-   "name" : "android::hardware::BHwBinder **",
-   "referenced_type" : "type-8",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const *",
-   "name" : "android::hardware::BHwBinder *const *",
-   "referenced_type" : "type-665",
-   "self_type" : "type-666",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-147",
-   "self_type" : "type-146",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder *",
-   "name" : "android::hardware::BpHwBinder *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
-   "name" : "android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-485",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-273",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwRefBase *",
-   "name" : "android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput *",
-   "name" : "android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump *",
-   "name" : "android::hardware::HexDump *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-588",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder *",
-   "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-657",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IPCThreadState *",
-   "name" : "android::hardware::IPCThreadState *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState *",
-   "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
-   "name" : "android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput *",
-   "name" : "android::hardware::TextOutput *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
-   "name" : "android::hardware::TextOutput::Bundle *",
-   "referenced_type" : "type-579",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TypeCode *",
-   "name" : "android::hardware::TypeCode *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-484",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Thread> *",
-   "name" : "android::sp<android::Thread> *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
-   "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-538",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-604",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-506",
-   "self_type" : "type-526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> *",
-   "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
-   "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-366",
-   "self_type" : "type-543",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-112",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
-   "name" : "android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-225",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-372",
-   "self_type" : "type-371",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-114",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-806",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-610",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase *> *",
-   "name" : "const android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-682",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-515",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-616",
-   "self_type" : "type-617",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BHwBinder *",
-   "name" : "const android::hardware::BHwBinder *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder *",
-   "name" : "const android::hardware::BpHwBinder *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-285",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
-   "name" : "const android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-488",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-530",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwRefBase *",
-   "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
-   "name" : "const android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-612",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump *",
-   "name" : "const android::hardware::HexDump *",
-   "referenced_type" : "type-447",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
-   "name" : "const android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-524",
-   "self_type" : "type-525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IInterface *",
-   "name" : "const android::hardware::IInterface *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IPCThreadState *",
-   "name" : "const android::hardware::IPCThreadState *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel *",
-   "name" : "const android::hardware::Parcel *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState *",
-   "name" : "const android::hardware::ProcessState *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
-   "name" : "const android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode *",
-   "name" : "const android::hardware::TypeCode *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Thread> *",
-   "name" : "const android::sp<android::Thread> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
-   "name" : "const android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-714",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
-   "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
-   "name" : "const android::sp<android::hardware::IInterface> *",
-   "referenced_type" : "type-655",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
-   "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
-   "name" : "const android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char16_t *",
-   "name" : "const char16_t *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-269",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-168",
-   "self_type" : "type-170",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-85",
-   "self_type" : "type-105",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *",
-   "name" : "const unsigned int *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-793",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long *",
-   "name" : "const unsigned long long *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void **",
-   "name" : "const void **",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double *",
-   "name" : "double *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float *",
-   "name" : "float *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-235",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-177",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long *",
-   "name" : "long long *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "short *",
-   "name" : "short *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "signed char *",
-   "name" : "signed char *",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-644",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long long *",
-   "name" : "unsigned long long *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned short *",
-   "name" : "unsigned short *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(const void *, void *, void *)",
-   "name" : "void (*)(const void *, void *, void *)",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-648",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase *const",
-   "name" : "android::RefBase *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-137",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-160",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-188",
-   "self_type" : "type-190",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-203",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-218",
-   "self_type" : "type-220",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-229",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-263",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-333",
-   "self_type" : "type-336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-419",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-45",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-499",
-   "self_type" : "type-501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-600",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-641",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-651",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-677",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_type *const",
-   "name" : "android::RefBase::weakref_type *const",
-   "referenced_type" : "type-20",
-   "self_type" : "type-667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::BHwBinder *const",
-   "name" : "android::hardware::BHwBinder *const",
-   "referenced_type" : "type-8",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::IBinder *const",
-   "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-33",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "char *const",
-   "name" : "char *const",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[10]",
-   "name" : "char const[10]",
-   "referenced_type" : "type-720",
-   "self_type" : "type-719",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[11]",
-   "name" : "char const[11]",
-   "referenced_type" : "type-742",
-   "self_type" : "type-741",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[12]",
-   "name" : "char const[12]",
-   "referenced_type" : "type-717",
-   "self_type" : "type-716",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[13]",
-   "name" : "char const[13]",
-   "referenced_type" : "type-713",
-   "self_type" : "type-712",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[14]",
-   "name" : "char const[14]",
-   "referenced_type" : "type-761",
-   "self_type" : "type-760",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[15]",
-   "name" : "char const[15]",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[16]",
-   "name" : "char const[16]",
-   "referenced_type" : "type-745",
-   "self_type" : "type-744",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[17]",
-   "name" : "char const[17]",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[18]",
-   "name" : "char const[18]",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[19]",
-   "name" : "char const[19]",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[20]",
-   "name" : "char const[20]",
-   "referenced_type" : "type-758",
-   "self_type" : "type-757",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[22]",
-   "name" : "char const[22]",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[25]",
-   "name" : "char const[25]",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[28]",
-   "name" : "char const[28]",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[29]",
-   "name" : "char const[29]",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[2]",
-   "name" : "char const[2]",
-   "referenced_type" : "type-723",
-   "self_type" : "type-722",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[31]",
-   "name" : "char const[31]",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[32]",
-   "name" : "char const[32]",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[35]",
-   "name" : "char const[35]",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[37]",
-   "name" : "char const[37]",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[3]",
-   "name" : "char const[3]",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[4]",
-   "name" : "char const[4]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-118",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[5]",
-   "name" : "char const[5]",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[6]",
-   "name" : "char const[6]",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[7]",
-   "name" : "char const[7]",
-   "referenced_type" : "type-752",
-   "self_type" : "type-751",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[8]",
-   "name" : "char const[8]",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[9]",
-   "name" : "char const[9]",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-803",
-   "self_type" : "type-805",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-356",
-   "self_type" : "type-357",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-274",
-   "self_type" : "type-522",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-15",
-   "self_type" : "type-502",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-343",
-   "self_type" : "type-345",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-509",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-281",
-   "self_type" : "type-374",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-375",
-   "self_type" : "type-535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase *>",
-   "name" : "const android::Vector<android::RefBase *>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-690",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
-   "name" : "const android::Vector<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-519",
-   "self_type" : "type-686",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-693",
-   "self_type" : "type-695",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
-   "name" : "const android::Vector<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-518",
-   "self_type" : "type-682",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-515",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<int>",
-   "name" : "const android::Vector<int>",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-179",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BHwBinder",
-   "name" : "const android::hardware::BHwBinder",
-   "referenced_type" : "type-9",
-   "self_type" : "type-117",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder",
-   "name" : "const android::hardware::BpHwBinder",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
-   "name" : "const android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-286",
-   "self_type" : "type-487",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager",
-   "referenced_type" : "type-273",
-   "self_type" : "type-530",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-494",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwRefBase",
-   "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-134",
-   "self_type" : "type-148",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput",
-   "name" : "const android::hardware::BufferedTextOutput",
-   "referenced_type" : "type-606",
-   "self_type" : "type-611",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::HexDump",
-   "name" : "const android::hardware::HexDump",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder",
-   "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-14",
-   "self_type" : "type-639",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
-   "name" : "const android::hardware::IBinder::DeathRecipient",
-   "referenced_type" : "type-60",
-   "self_type" : "type-524",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IInterface",
-   "name" : "const android::hardware::IInterface",
-   "referenced_type" : "type-287",
-   "self_type" : "type-660",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IPCThreadState",
-   "name" : "const android::hardware::IPCThreadState",
-   "referenced_type" : "type-536",
-   "self_type" : "type-702",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState",
-   "name" : "const android::hardware::ProcessState",
-   "referenced_type" : "type-368",
-   "self_type" : "type-384",
-   "size" : 120,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
-   "name" : "const android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-319",
-   "self_type" : "type-321",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::TypeCode",
-   "name" : "const android::hardware::TypeCode",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Thread>",
-   "name" : "const android::sp<android::Thread>",
-   "referenced_type" : "type-34",
-   "self_type" : "type-349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
-   "name" : "const android::sp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "referenced_type" : "type-574",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-196",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-51",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
-   "name" : "const android::sp<android::hardware::IInterface>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
-   "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
-   "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-115",
-   "self_type" : "type-377",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-376",
-   "self_type" : "type-582",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const char16_t",
-   "name" : "const char16_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-283",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-97",
-   "self_type" : "type-330",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-95",
-   "self_type" : "type-239",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-165",
-   "self_type" : "type-168",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-93",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-89",
-   "self_type" : "type-474",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-87",
-   "self_type" : "type-471",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-66",
-   "self_type" : "type-73",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char *const",
-   "name" : "const unsigned char *const",
-   "referenced_type" : "type-72",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int *const",
-   "name" : "const unsigned int *const",
-   "referenced_type" : "type-793",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-68",
-   "self_type" : "type-75",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-91",
-   "self_type" : "type-476",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-104",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const void *const",
-   "name" : "const void *const",
-   "referenced_type" : "type-103",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-12",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile int",
-   "name" : "volatile int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-270",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-497"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "d_",
-     "field_offset" : 32,
-     "referenced_type" : "type-604"
-    },
-    {
-     "access" : "private",
-     "field_name" : "s_",
-     "field_offset" : 64,
-     "referenced_type" : "type-605"
-    }
-   ],
-   "linker_set_key" : "Renamer",
-   "name" : "Renamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
-    },
-    {
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-693"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-343"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-281", "type-51" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-275"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-103", "type-278" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-3" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-40"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-242"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-257"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-257"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-16"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-276"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "record_kind" : "class",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-344" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-276"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-277" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-282"
-    }
-   ],
-   "linker_set_key" : "android::String16",
-   "name" : "android::String16",
-   "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "unique_id" : "_ZTSN7android8String16E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-376"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-41"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-43"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-43"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-34"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase *>",
-   "name" : "android::Vector<android::RefBase *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
-   "name" : "android::Vector<android::RefBase::weakref_type *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-375" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
-   "name" : "android::Vector<android::hardware::BHwBinder *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "record_kind" : "class",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "record_kind" : "class",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<int>",
-   "name" : "android::Vector<int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android6VectorIiEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281", "type-51" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103", "type-278" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPolicy",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExtras",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReserved0",
-     "field_offset" : 128,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BHwBinder",
-   "name" : "android::hardware::BHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlive",
-     "field_offset" : 96,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObitsSent",
-     "field_offset" : 128,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObituaries",
-     "field_offset" : 160,
-     "referenced_type" : "type-271"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 192,
-     "referenced_type" : "type-273"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mConstantData",
-     "field_offset" : 352,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDescriptorCache",
-     "field_offset" : 384,
-     "referenced_type" : "type-281"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder",
-   "name" : "android::hardware::BpHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 52,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "recipient",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "cookie",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
-   "name" : "android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "referenced_type" : "type-274"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
-   "name" : "android::hardware::BpHwBinder::ObjectManager",
-   "record_kind" : "class",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "object",
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cleanupCookie",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "func",
-     "field_offset" : 64,
-     "referenced_type" : "type-279"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRemote",
-     "field_offset" : 32,
-     "referenced_type" : "type-135"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 96,
-     "referenced_type" : "type-136"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwRefBase",
-   "name" : "android::hardware::BpHwRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-440"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSeq",
-     "field_offset" : 64,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 128,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGlobalState",
-     "field_offset" : 160,
-     "referenced_type" : "type-575"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BufferedTextOutput",
-   "name" : "android::hardware::BufferedTextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBytesPerLine",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSingleLineCutoff",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlignment",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCArrayStyle",
-     "field_offset" : 160,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "linker_set_key" : "android::hardware::HexDump",
-   "name" : "android::hardware::HexDump",
-   "record_kind" : "class",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder",
-   "name" : "android::hardware::IBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
-   "name" : "android::hardware::IBinder::DeathRecipient",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IInterface",
-   "name" : "android::hardware::IInterface",
-   "record_kind" : "class",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mProcess",
-     "referenced_type" : "type-537"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingStrongDerefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-518"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingWeakDerefs",
-     "field_offset" : 192,
-     "referenced_type" : "type-519"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteStrongDerefs",
-     "field_offset" : 352,
-     "referenced_type" : "type-520"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteWeakDerefs",
-     "field_offset" : 512,
-     "referenced_type" : "type-519"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIn",
-     "field_offset" : 672,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOut",
-     "field_offset" : 1216,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastError",
-     "field_offset" : 1760,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingPid",
-     "field_offset" : 1792,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingSid",
-     "field_offset" : 1824,
-     "referenced_type" : "type-376"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingUid",
-     "field_offset" : 1856,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStrictModePolicy",
-     "field_offset" : 1888,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastTransactionBinderFlags",
-     "field_offset" : 1920,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContextObject",
-     "field_offset" : 1952,
-     "referenced_type" : "type-538"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsLooper",
-     "field_offset" : 1984,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsPollingThread",
-     "field_offset" : 1992,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostCommandTasks",
-     "field_offset" : 2016,
-     "referenced_type" : "type-539"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIPCThreadStateBase",
-     "field_offset" : 2112,
-     "referenced_type" : "type-540"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 2144,
-     "referenced_type" : "type-378"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IPCThreadState",
-   "name" : "android::hardware::IPCThreadState",
-   "record_kind" : "class",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
-   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBufCachePos",
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufCache",
-     "field_offset" : 32,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mError",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 160,
-     "referenced_type" : "type-65"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataCapacity",
-     "field_offset" : 224,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataPos",
-     "field_offset" : 256,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 288,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsCapacity",
-     "field_offset" : 352,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNextObjectHint",
-     "field_offset" : 384,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumRef",
-     "field_offset" : 416,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFdsKnown",
-     "field_offset" : 448,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHasFds",
-     "field_offset" : 456,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllowFds",
-     "field_offset" : 464,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 480,
-     "referenced_type" : "type-69"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnerCookie",
-     "field_offset" : 512,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel",
-   "name" : "android::hardware::Parcel",
-   "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6ParcelE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "index",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "buffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-68"
-    },
-    {
-     "field_name" : "bufend",
-     "field_offset" : 96,
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
-   "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDriverFD",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVMStart",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountDecrement",
-     "field_offset" : 128,
-     "referenced_type" : "type-370"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExecutingThreadsCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMaxThreads",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStarvationStartTimeMs",
-     "field_offset" : 224,
-     "referenced_type" : "type-93"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 288,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandleToObject",
-     "field_offset" : 320,
-     "referenced_type" : "type-348"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mManagesContexts",
-     "field_offset" : 480,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextCheckFunc",
-     "field_offset" : 512,
-     "referenced_type" : "type-371"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextUserData",
-     "field_offset" : 544,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContexts",
-     "field_offset" : 576,
-     "referenced_type" : "type-356"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRootDir",
-     "field_offset" : 736,
-     "referenced_type" : "type-375"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolStarted",
-     "field_offset" : 768,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSpawnThreadOnStart",
-     "field_offset" : 776,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolSeq",
-     "field_offset" : 800,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMmapSize",
-     "field_offset" : 832,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 864,
-     "referenced_type" : "type-378"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState",
-   "name" : "android::hardware::ProcessState",
-   "record_kind" : "class",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 120,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 112,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -112,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -112,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "binder",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
-   "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput",
-   "name" : "android::hardware::TextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTO",
-     "referenced_type" : "type-580"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TextOutput::Bundle",
-   "name" : "android::hardware::TextOutput::Bundle",
-   "record_kind" : "class",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCode",
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TypeCode",
-   "name" : "android::hardware::TypeCode",
-   "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-281"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-51"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281", "type-51" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103", "type-278" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
-   "name" : "android::sp<android::hardware::BHwBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-575"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-577" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-657"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-287" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
-   "name" : "android::sp<android::hardware::ProcessState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-368" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
-   "name" : "android::trait_pointer<android::RefBase *>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::String16>",
-   "name" : "android::trait_pointer<android::String16>",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<const void *>",
-   "name" : "android::trait_pointer<const void *>",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<int>",
-   "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
-   "name" : "android::trait_trivial_copy<android::RefBase *>",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
-   "name" : "android::trait_trivial_copy<android::String16>",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<const void *>",
-   "name" : "android::trait_trivial_copy<const void *>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
-   "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
-   "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase *>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
-   "name" : "android::trait_trivial_ctor<android::String16>",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
-   "name" : "android::trait_trivial_ctor<const void *>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long long>",
-   "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
-   "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
-   "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
-   "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase *>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
-   "name" : "android::trait_trivial_dtor<android::String16>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
-   "name" : "android::trait_trivial_dtor<const void *>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long long>",
-   "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
-   "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-423",
-   "self_type" : "type-423",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
-   "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
-   "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
-   "name" : "android::trait_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String16>",
-   "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-375" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-328",
-   "self_type" : "type-328",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<const void *>",
-   "name" : "android::trait_trivial_move<const void *>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned int>",
-   "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long>",
-   "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase *>",
-   "name" : "android::traits<android::RefBase *>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
-   "name" : "android::traits<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::String16>",
-   "name" : "android::traits<android::String16>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
-   "name" : "android::traits<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<const void *>",
-   "name" : "android::traits<const void *>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android6traitsIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<int>",
-   "name" : "android::traits<int>",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android6traitsIiEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-676"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
-   "name" : "android::use_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-674"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-672"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-492"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-325"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-327"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-490"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-636"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-415"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<int>",
-   "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder>",
-   "name" : "android::wp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-216"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-228"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-222"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-225"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-65"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-217"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-216"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-167"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-162"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-157"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-158"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-158"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-158"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-158"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-84"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "lock",
-     "referenced_type" : "type-614"
-    },
-    {
-     "field_name" : "has_tls",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tls",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "thread_store_t",
-   "name" : "thread_store_t",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
-   "unique_id" : "thread_store_t"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "referenced_type" : "type-506",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
-   "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/29/64/x86_64/source-based/libhidlbase.so.lsdump b/29/64/x86_64/source-based/libhidlbase.so.lsdump
index aa8c020..70b393e 100644
--- a/29/64/x86_64/source-based/libhidlbase.so.lsdump
+++ b/29/64/x86_64/source-based/libhidlbase.so.lsdump
@@ -5,40 +5,283 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-664",
+   "referenced_type" : "type-43",
+   "self_type" : "type-175",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "char [10]",
+   "name" : "char [10]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3469",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [11]",
+   "name" : "char [11]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3494",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [12]",
+   "name" : "char [12]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3464",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [13]",
+   "name" : "char [13]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3461",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [14]",
+   "name" : "char [14]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3513",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [15]",
+   "name" : "char [15]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3612",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [16]",
+   "name" : "char [16]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3498",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [17]",
+   "name" : "char [17]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3516",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [18]",
+   "name" : "char [18]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3501",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [19]",
+   "name" : "char [19]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3532",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [20]",
+   "name" : "char [20]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3510",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [22]",
+   "name" : "char [22]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3535",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [25]",
+   "name" : "char [25]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3525",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [28]",
+   "name" : "char [28]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3547",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [29]",
+   "name" : "char [29]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3522",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [2]",
+   "name" : "char [2]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3473",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [31]",
+   "name" : "char [31]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3507",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3538",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [35]",
+   "name" : "char [35]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3529",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [37]",
+   "name" : "char [37]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3519",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [3]",
+   "name" : "char [3]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3486",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4]",
+   "name" : "char [4]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [5]",
+   "name" : "char [5]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3615",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "char [64]",
    "name" : "char [64]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "type-43",
+   "self_type" : "type-362",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [6]",
+   "name" : "char [6]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3476",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [7]",
+   "name" : "char [7]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3504",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [8]",
+   "name" : "char [8]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3491",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [9]",
+   "name" : "char [9]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3480",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
+   "referenced_type" : "type-238",
+   "self_type" : "type-237",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-435",
+   "referenced_type" : "type-146",
+   "self_type" : "type-972",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46,8 +289,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-670",
+   "referenced_type" : "type-146",
+   "self_type" : "type-181",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -55,8 +298,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-102",
-   "self_type" : "type-714",
+   "referenced_type" : "type-44",
+   "self_type" : "type-228",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +312,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1
   },
   {
@@ -78,8 +321,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1
   },
   {
@@ -88,8 +331,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 2
   },
   {
@@ -104,8 +347,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 4
   },
   {
@@ -113,8 +356,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -122,8 +365,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-265",
+   "self_type" : "type-265",
    "size" : 8
   },
   {
@@ -131,8 +374,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 8
   },
   {
@@ -140,8 +383,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 2
   },
   {
@@ -149,8 +392,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 1
   },
   {
@@ -159,8 +402,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -169,8 +412,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4
   },
   {
@@ -179,8 +422,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8
   },
   {
@@ -189,8 +432,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-389",
+   "self_type" : "type-389",
    "size" : 8
   },
   {
@@ -199,15 +442,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108"
+   "referenced_type" : "type-77",
+   "self_type" : "type-77"
   }
  ],
  "elf_functions" :
@@ -218,10 +461,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
   },
   {
@@ -1173,6 +1432,78 @@
    "name" : "_ZN7android4hidl7manager4V1_218BpHwServiceManagerC2ERKNS_2spINS_8hardware7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE"
   },
   {
@@ -1203,6 +1534,36 @@
    "name" : "_ZN7android8hardware10HidlMemoryD2Ev"
   },
   {
+   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD2Ev"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
@@ -1219,6 +1580,30 @@
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl7manager4V1_215IServiceManagerENS4_18BpHwServiceManagerENS4_18BnHwServiceManagerEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware11hidl_handle10freeHandleEv"
   },
   {
@@ -1330,18 +1715,243 @@
    "name" : "_ZN7android8hardware11hidl_stringaSERKS1_"
   },
   {
+   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEm"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEmPm"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEmb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC1Em"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC2Em"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_6StatusEPNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhmPKymPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEl"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
    "name" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware14readFromParcelERKNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_"
   },
   {
@@ -1354,9 +1964,45 @@
    "name" : "_ZN7android8hardware16setRequestingSidERKNS_2spINS_4hidl4base4V1_05IBaseEEEb"
   },
   {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android8hardware17joinRpcThreadpoolEv"
   },
   {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE"
   },
   {
@@ -1375,6 +2021,9 @@
    "name" : "_ZN7android8hardware20LazyServiceRegistrarC2Ev"
   },
   {
+   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware21defaultServiceManagerEv"
   },
   {
@@ -1441,6 +2090,184 @@
    "name" : "_ZN7android8hardware31setProcessHidlReturnRestrictionENS0_21HidlReturnRestrictionE"
   },
   {
+   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt64El"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11finishWriteEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11setDataSizeEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvmPm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint64Em"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12restartWriteEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeInplaceEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writePointerEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13continueWriteEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPmmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhmPKymPFvPS1_S3_mS5_mPvES7_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvmPmmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPmmmmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlemm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPmmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel5writeEPKvm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel6removeEmm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel7setDataEPKhm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8growDataEm"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9initStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware6Status11fromStatusTEi"
   },
   {
@@ -1471,6 +2298,30 @@
    "name" : "_ZN7android8hardware6StatusC2EiiPKc"
   },
   {
+   "name" : "_ZN7android8hardware7HexDumpC1EPKvmm"
+  },
+  {
+   "name" : "_ZN7android8hardware7HexDumpC2EPKvmm"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE"
   },
   {
@@ -1650,12 +2501,75 @@
    "name" : "_ZN7android8hardware7details25registerAsServiceInternalERKNS_2spINS_4hidl4base4V1_05IBaseEEERKNSt3__112basic_stringIcNSA_11char_traitsIcEENSA_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
+  },
+  {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE"
   },
   {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE"
   },
   {
+   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv"
   },
   {
@@ -1677,12 +2591,259 @@
    "name" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv"
   },
   {
+   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64EPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readInplaceEm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPmPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEmPmmmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEmPmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectmjmm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEmm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEmm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPmmmPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEmmPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEmPmmmPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebmm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEmmPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4dataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4readEPvm"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64EPl"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
+  },
+  {
    "name" : "_ZNK7android8hardware6Status11descriptionEv"
   },
   {
+   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware7details13return_status8assertOkEv"
   },
   {
+   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNKSt3__110__back_refIcE6__execERNS_7__stateIcEE"
   },
@@ -2515,12 +3676,66 @@
    "name" : "_ZTv0_n24_N7android4hidl7manager4V1_218BnHwServiceManagerD1Ev"
   },
   {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD1Ev"
+  },
+  {
    "name" : "_ZTv0_n24_N7android8hardware10HidlMemoryD0Ev"
   },
   {
    "name" : "_ZTv0_n24_N7android8hardware10HidlMemoryD1Ev"
   },
   {
+   "name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
    "name" : "__addtf3"
   },
   {
@@ -2561,6 +3776,18 @@
   },
   {
    "name" : "__unordtf2"
+  },
+  {
+   "name" : "getHWBinderKernelReferences"
+  },
+  {
+   "name" : "printHexData"
+  },
+  {
+   "name" : "printTypeCode"
+  },
+  {
+   "name" : "stringForIndent"
   }
  ],
  "elf_objects" :
@@ -2612,6 +3839,21 @@
    "name" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE"
   },
   {
+   "name" : "_ZN7android8hardware12gTextBuffersE"
+  },
+  {
+   "name" : "_ZN7android8hardware13gProcessMutexE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aerrE"
+  },
+  {
+   "name" : "_ZN7android8hardware4alogE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aoutE"
+  },
+  {
    "name" : "_ZN7android8hardware7details14gServiceSidMapE"
   },
   {
@@ -2627,6 +3869,9 @@
    "name" : "_ZN7android8hardware7details6gBnMapE"
   },
   {
+   "name" : "_ZN7android8hardware8gProcessE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android4hidl4base4V1_06BsBaseE0_NS2_5IBaseE"
   },
@@ -2822,6 +4067,13 @@
    "name" : "_ZTCN7android4hidl7manager4V1_218BpHwServiceManagerE8_NS_8hardware10IInterfaceE"
   },
   {
+   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE0_NS4_5IBaseE"
   },
@@ -2851,6 +4103,9 @@
    "name" : "_ZTCN7android8hardware7details6WaiterE0_NS_4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE0_NS_13basic_istreamIcS2_EE"
   },
@@ -2868,6 +4123,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
   },
   {
@@ -2925,16 +4192,31 @@
    "name" : "_ZTTN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "name" : "_ZTTN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTTN7android8hardware10IInterfaceE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
+   "name" : "_ZTTN7android8hardware12ProcessStateE"
+  },
+  {
    "name" : "_ZTTN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTTN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware7details21ClientCounterCallbackE"
   },
   {
@@ -2942,6 +4224,9 @@
    "name" : "_ZTTN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTTN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE"
   },
@@ -2954,6 +4239,14 @@
    "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
    "name" : "_ZTVN7android4hidl4base4V1_05IBaseE"
   },
   {
@@ -3032,20 +4325,85 @@
    "name" : "_ZTVN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIiEE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTVN7android8hardware10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware10PoolThreadE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10TextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android8hardware12FdTextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware12ProcessStateE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware13LogTextOutputE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android8hardware25PassthroughServiceManagerE"
   },
   {
    "name" : "_ZTVN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTVN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware7details16HidlInstrumentorE"
   },
   {
@@ -3056,6 +4414,9 @@
    "name" : "_ZTVN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTVN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__110__back_refIcEE"
   },
@@ -3141,6 +4502,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -3217,11 +4582,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -3235,11 +4600,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -3253,11 +4618,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -3279,11 +4644,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -3309,11 +4674,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -3331,11 +4696,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -3344,6 +4709,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-14",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -3385,11 +4776,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -3439,11 +4830,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -3465,11 +4856,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -3483,11 +4874,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -3509,11 +4900,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-182",
+   "underlying_type" : "type-146",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3559,11 +4950,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -3613,11 +5004,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -3639,11 +5030,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -3681,11 +5072,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-216",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -3923,11 +5314,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -3953,11 +5344,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -3983,11 +5374,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4025,11 +5416,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_component"
   },
   {
@@ -4063,11 +5454,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_format"
   },
   {
@@ -4089,11 +5480,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -4107,11 +5498,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -4137,11 +5528,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-226",
+   "self_type" : "type-226",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -4231,11 +5622,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -4273,11 +5664,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -4291,11 +5682,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-224",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -4321,11 +5712,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-221",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -4355,11 +5746,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-698",
-   "self_type" : "type-698",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_transform_t"
   },
   {
@@ -4409,11 +5800,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-696",
-   "self_type" : "type-696",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "log_id"
   }
  ],
@@ -4421,18 +5812,138 @@
  [
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    }
+   ],
+   "referenced_type" : "type-2291",
+   "return_type" : "type-2287",
+   "self_type" : "type-2291",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-693"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2241",
+   "return_type" : "type-29",
+   "self_type" : "type-2241",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (void *)",
    "name" : "int (void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     }
    ],
-   "referenced_type" : "type-729",
-   "return_type" : "type-17",
-   "self_type" : "type-729",
+   "referenced_type" : "type-243",
+   "return_type" : "type-14",
+   "self_type" : "type-243",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2303"
+    }
+   ],
+   "referenced_type" : "type-2302",
+   "return_type" : "type-2303",
+   "self_type" : "type-2302",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-989"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2163",
+   "return_type" : "type-77",
+   "self_type" : "type-2163",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (const void *, void *, void *)",
+   "name" : "void (const void *, void *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2157",
+   "return_type" : "type-77",
+   "self_type" : "type-2157",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (void *, const char *)",
+   "name" : "void (void *, const char *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "referenced_type" : "type-3398",
+   "return_type" : "type-77",
+   "self_type" : "type-3398",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "functions" :
@@ -4444,10 +5955,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-967"
+     "referenced_type" : "type-540"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-449"
+    },
+    {
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-3657",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -4457,29 +5984,77 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-436"
+    },
+    {
+     "referenced_type" : "type-437"
+    }
+   ],
+   "return_type" : "type-439",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-436"
+    },
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-439",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2193"
+    },
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-3571",
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::hidl::base::V1_0::IBase::linkToDeath",
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEm",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4489,13 +6064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2117"
+     "referenced_type" : "type-2561"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4505,13 +6080,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2118"
+     "referenced_type" : "type-2562"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4521,13 +6096,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4537,13 +6112,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2119"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4553,13 +6128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2120"
+     "referenced_type" : "type-2564"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4569,10 +6144,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4582,10 +6157,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4595,10 +6170,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4608,16 +6183,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4626,14 +6201,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4644,13 +6219,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1825"
+     "referenced_type" : "type-2063"
     },
     {
-     "referenced_type" : "type-2123"
+     "referenced_type" : "type-2567"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4660,13 +6235,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1825"
+     "referenced_type" : "type-2063"
     },
     {
-     "referenced_type" : "type-862"
+     "referenced_type" : "type-411"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4676,13 +6251,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1825"
+     "referenced_type" : "type-2063"
     },
     {
-     "referenced_type" : "type-862"
+     "referenced_type" : "type-411"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4691,19 +6266,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2126"
+     "referenced_type" : "type-2570"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4713,27 +6288,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2127"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4742,19 +6317,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2128"
+     "referenced_type" : "type-2572"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4765,13 +6340,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2573"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4780,19 +6355,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2130"
+     "referenced_type" : "type-2574"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4801,19 +6376,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2131"
+     "referenced_type" : "type-2575"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4822,19 +6397,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2132"
+     "referenced_type" : "type-2576"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4843,19 +6418,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2133"
+     "referenced_type" : "type-2577"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4864,19 +6439,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1856"
+     "referenced_type" : "type-2093"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-2134"
+     "referenced_type" : "type-2578"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4887,10 +6462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4900,13 +6475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4916,19 +6491,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-1853"
+     "referenced_type" : "type-2090"
     },
     {
-     "referenced_type" : "type-1853"
+     "referenced_type" : "type-2090"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4938,13 +6513,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4954,19 +6529,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-1853"
+     "referenced_type" : "type-2090"
     },
     {
-     "referenced_type" : "type-1853"
+     "referenced_type" : "type-2090"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4976,10 +6551,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4989,10 +6564,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -5002,10 +6577,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -5014,13 +6589,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5029,19 +6604,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5051,16 +6626,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5070,13 +6645,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-2135"
+     "referenced_type" : "type-2579"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5086,13 +6661,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-2136"
+     "referenced_type" : "type-2580"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5102,13 +6677,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5118,13 +6693,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-2137"
+     "referenced_type" : "type-2581"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5133,16 +6708,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-2138"
+     "referenced_type" : "type-2582"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5151,16 +6726,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-2139"
+     "referenced_type" : "type-2583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5170,13 +6745,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-2140"
+     "referenced_type" : "type-2584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5185,16 +6760,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-2141"
+     "referenced_type" : "type-2585"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5204,10 +6779,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5217,10 +6792,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5229,16 +6804,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-2142"
+     "referenced_type" : "type-2586"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5247,13 +6822,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5262,13 +6837,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2066"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5278,10 +6853,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5291,16 +6866,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5310,13 +6885,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5326,13 +6901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5342,14 +6917,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5359,16 +6934,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5378,13 +6953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1414"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5394,13 +6969,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5410,14 +6985,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5427,13 +7002,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5443,13 +7018,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5459,14 +7034,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5476,13 +7051,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-1039"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5492,10 +7067,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5505,10 +7080,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5517,13 +7092,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5533,10 +7108,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5546,16 +7121,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5564,14 +7139,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-944",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5580,14 +7155,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-944",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5598,13 +7173,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-917"
     },
     {
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1420"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5614,13 +7189,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-917"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5630,13 +7205,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-917"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-530"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5645,19 +7220,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1426"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5667,27 +7242,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1427"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5698,13 +7273,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-1050"
+     "referenced_type" : "type-1428"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5713,19 +7288,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-1429"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5734,19 +7309,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1052"
+     "referenced_type" : "type-1430"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5755,19 +7330,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1053"
+     "referenced_type" : "type-1431"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5776,19 +7351,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1432"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5797,19 +7372,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5820,10 +7395,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5832,19 +7407,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5853,19 +7428,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1435"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5875,13 +7450,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5891,13 +7466,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5907,10 +7482,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5920,10 +7495,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5933,10 +7508,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-828"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5945,16 +7520,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5964,16 +7539,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5983,13 +7558,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1059"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5999,13 +7574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1060"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6015,16 +7590,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-764",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6034,13 +7609,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6050,13 +7625,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6065,16 +7640,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1440"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6084,16 +7659,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1063"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6102,19 +7677,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-764",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6124,13 +7699,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1064"
+     "referenced_type" : "type-1442"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6139,19 +7714,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1065"
+     "referenced_type" : "type-1443"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6161,10 +7736,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6174,10 +7749,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6187,19 +7762,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6209,16 +7784,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6227,22 +7802,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6251,19 +7826,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6273,16 +7848,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6292,16 +7867,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6311,13 +7886,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1066"
+     "referenced_type" : "type-1444"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6327,10 +7902,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6340,16 +7915,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6358,19 +7933,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6379,19 +7954,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-928"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6401,13 +7976,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1067"
+     "referenced_type" : "type-1445"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6417,13 +7992,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6433,13 +8008,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6449,14 +8024,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6466,16 +8041,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6485,13 +8060,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6501,13 +8076,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1069"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6517,14 +8092,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6534,13 +8109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6550,13 +8125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1070"
+     "referenced_type" : "type-1448"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6566,14 +8141,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6583,13 +8158,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-1071"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6599,10 +8174,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6612,10 +8187,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6624,13 +8199,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6640,10 +8215,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6653,16 +8228,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6671,14 +8246,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1053",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6687,14 +8262,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1053",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6705,13 +8280,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1045"
     },
     {
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1452"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6721,13 +8296,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1045"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-546"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6737,13 +8312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1045"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-546"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6752,19 +8327,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1033"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1004"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6773,19 +8348,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1033"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6795,27 +8370,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1086"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1087"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1077"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6826,13 +8401,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     },
     {
-     "referenced_type" : "type-1078"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6841,19 +8416,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1086"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-1079"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6864,10 +8439,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6877,13 +8452,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6893,13 +8468,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6909,10 +8484,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6922,10 +8497,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6935,10 +8510,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-820"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6948,16 +8523,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6967,13 +8542,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-1080"
+     "referenced_type" : "type-1458"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6983,13 +8558,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-1081"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6999,13 +8574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7015,13 +8590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-1082"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7031,19 +8606,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7053,13 +8628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-1083"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7068,22 +8643,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-1048"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7093,10 +8668,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7106,10 +8681,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7119,10 +8694,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7132,16 +8707,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7151,13 +8726,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7167,13 +8742,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-937"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7183,14 +8758,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7200,16 +8775,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7219,13 +8794,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-1084"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7235,13 +8810,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-1085"
+     "referenced_type" : "type-1463"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7251,14 +8826,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7268,13 +8843,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7284,13 +8859,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-1086"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7300,14 +8875,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7317,13 +8892,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-1087"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7333,10 +8908,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7346,10 +8921,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7358,13 +8933,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7374,10 +8949,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7387,16 +8962,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7405,14 +8980,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7421,14 +8996,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7437,14 +9012,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-717"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7455,13 +9030,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1099"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7471,13 +9046,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1099"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7487,13 +9062,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1099"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-535"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7503,27 +9078,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1144"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1145"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1474"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7534,13 +9109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1475"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7549,19 +9124,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1144"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1145"
     },
     {
-     "referenced_type" : "type-1098"
+     "referenced_type" : "type-1476"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7572,10 +9147,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7585,13 +9160,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-717"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7601,13 +9176,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-717"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7617,10 +9192,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7630,10 +9205,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7643,10 +9218,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-837"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7656,16 +9231,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7675,13 +9250,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1477"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7691,13 +9266,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1478"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7707,16 +9282,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-764",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7726,13 +9301,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7742,13 +9317,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1479"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7758,16 +9333,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-1480"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7777,13 +9352,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1481"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7793,10 +9368,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7806,10 +9381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7819,19 +9394,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7841,16 +9416,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7860,19 +9435,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7881,22 +9456,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-1103"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7906,16 +9481,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7925,16 +9500,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7944,13 +9519,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1482"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7960,10 +9535,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7973,16 +9548,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7992,13 +9567,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1483"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8008,13 +9583,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8024,13 +9599,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8040,14 +9615,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8057,16 +9632,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8076,13 +9651,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-2143"
+     "referenced_type" : "type-2587"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8092,13 +9667,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-2144"
+     "referenced_type" : "type-2588"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8108,14 +9683,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8125,13 +9700,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8141,13 +9716,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-2145"
+     "referenced_type" : "type-2589"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8157,14 +9732,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8174,13 +9749,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-2146"
+     "referenced_type" : "type-2590"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8190,10 +9765,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8203,10 +9778,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8215,13 +9790,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8231,10 +9806,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8244,16 +9819,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8262,14 +9837,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1715",
+   "return_type" : "type-1945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8278,14 +9853,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1715",
+   "return_type" : "type-1945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8295,14 +9870,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8312,16 +9887,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8331,13 +9906,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-2147"
+     "referenced_type" : "type-2591"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8347,13 +9922,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-2148"
+     "referenced_type" : "type-2592"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8363,14 +9938,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8380,13 +9955,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8396,13 +9971,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-2149"
+     "referenced_type" : "type-2593"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8412,14 +9987,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8429,13 +10004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-2150"
+     "referenced_type" : "type-2594"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8445,10 +10020,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8458,10 +10033,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8470,13 +10045,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8486,10 +10061,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8499,16 +10074,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8517,14 +10092,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8533,14 +10108,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-866"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8549,14 +10124,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-717"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8565,14 +10140,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-726"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8583,13 +10158,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1705"
+     "referenced_type" : "type-1929"
     },
     {
-     "referenced_type" : "type-2153"
+     "referenced_type" : "type-2597"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8599,13 +10174,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1705"
+     "referenced_type" : "type-1929"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-554"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8615,13 +10190,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1705"
+     "referenced_type" : "type-1929"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-554"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8632,13 +10207,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-2004"
     },
     {
-     "referenced_type" : "type-2158"
+     "referenced_type" : "type-2602"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8648,13 +10223,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-2004"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-541"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8664,13 +10239,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1771"
+     "referenced_type" : "type-2004"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-541"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8680,27 +10255,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1755"
+     "referenced_type" : "type-1986"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2165"
+     "referenced_type" : "type-2609"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8711,13 +10286,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     },
     {
-     "referenced_type" : "type-2166"
+     "referenced_type" : "type-2610"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8726,19 +10301,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1755"
+     "referenced_type" : "type-1986"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
-     "referenced_type" : "type-2167"
+     "referenced_type" : "type-2611"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8749,10 +10324,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8762,13 +10337,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8778,13 +10353,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8794,10 +10369,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8807,10 +10382,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8820,10 +10395,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-846"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8833,27 +10408,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2168"
+     "referenced_type" : "type-2612"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8864,13 +10439,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2613"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8879,19 +10454,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2170"
+     "referenced_type" : "type-2614"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8900,19 +10475,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2171"
+     "referenced_type" : "type-2615"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8921,19 +10496,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2616"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8942,19 +10517,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2173"
+     "referenced_type" : "type-2617"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8963,19 +10538,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2039"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-2174"
+     "referenced_type" : "type-2618"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8986,10 +10561,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8999,13 +10574,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-726"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9015,13 +10590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-726"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9031,10 +10606,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9044,10 +10619,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9057,10 +10632,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-853"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9070,16 +10645,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9089,13 +10664,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2175"
+     "referenced_type" : "type-2619"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9105,13 +10680,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2176"
+     "referenced_type" : "type-2620"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9121,13 +10696,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9137,13 +10712,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2177"
+     "referenced_type" : "type-2621"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9152,19 +10727,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-1935"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9174,13 +10749,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2622"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9190,10 +10765,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9203,10 +10778,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9216,10 +10791,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9229,16 +10804,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9248,16 +10823,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9267,13 +10842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9283,13 +10858,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9299,16 +10874,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9318,19 +10893,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9340,13 +10915,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2623"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9356,13 +10931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2624"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9372,16 +10947,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-764",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9391,19 +10966,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9413,13 +10988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9429,13 +11004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2625"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9445,16 +11020,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2182"
+     "referenced_type" : "type-2626"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9463,22 +11038,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9487,22 +11062,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9512,13 +11087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2183"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9528,10 +11103,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9541,10 +11116,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9554,22 +11129,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9579,16 +11154,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2628"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9598,19 +11173,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9620,16 +11195,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9639,16 +11214,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9658,19 +11233,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-737"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9679,25 +11254,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9706,19 +11281,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2185"
+     "referenced_type" : "type-2629"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9727,19 +11302,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1774"
+     "referenced_type" : "type-2008"
     },
     {
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-741"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9749,16 +11324,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9768,16 +11343,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-757",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9787,13 +11362,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2186"
+     "referenced_type" : "type-2630"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9803,10 +11378,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9816,16 +11391,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1002"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9835,13 +11410,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-2187"
+     "referenced_type" : "type-2631"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9851,13 +11426,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9867,25 +11442,435 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-2218"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-2146",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::sendObituary",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-2172"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-905"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-2227"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2632"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::HidlMemory::getInstance",
    "linker_set_key" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-65"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9894,10 +11879,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9906,16 +11891,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9926,19 +11911,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9949,10 +11934,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9963,19 +11948,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9986,10 +11971,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9999,10 +11984,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10012,10 +11997,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10025,24 +12010,155 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3411"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3406"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3408"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::fromBinder",
    "linker_set_key" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-35", "type-373", "type-229" ]
+   "template_args" : [ "type-302", "type-369", "type-299" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10050,12 +12166,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-148", "type-249", "type-247" ]
+   "template_args" : [ "type-496", "type-821", "type-819" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10063,12 +12179,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-156", "type-279", "type-276" ]
+   "template_args" : [ "type-499", "type-847", "type-844" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10076,12 +12192,139 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-693"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-129", "type-130", "type-228" ]
+   "template_args" : [ "type-518", "type-727", "type-802" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "access" : "private",
@@ -10091,10 +12334,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10104,17 +12347,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10124,13 +12367,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10140,13 +12383,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10156,13 +12399,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10172,10 +12415,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10185,13 +12428,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10201,13 +12444,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10217,13 +12460,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10233,10 +12476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10246,10 +12489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10259,10 +12502,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10272,13 +12515,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-88",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10288,13 +12531,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-88",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10304,13 +12547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-88",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10320,16 +12563,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10339,10 +12582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10353,16 +12596,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10373,13 +12616,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10389,13 +12632,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10405,13 +12648,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10421,16 +12664,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10440,13 +12683,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10456,13 +12699,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10472,10 +12715,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10485,13 +12728,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10501,13 +12744,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10517,16 +12760,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10536,13 +12779,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10552,13 +12795,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10568,10 +12811,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10581,10 +12824,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10594,10 +12837,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10607,13 +12850,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10623,13 +12866,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10639,13 +12882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10655,28 +12898,437 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
+   "return_type" : "type-445",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMaxThreads",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::startThreadPool",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEm",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-445",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-693"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-3623",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setCallRestriction",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getKernelReferences",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEmPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::becomeContextManager",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2243"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-165",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-2194",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEmb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::self",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
+   "return_type" : "type-445",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Em",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Em",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "function_name" : "android::hardware::writeToParcel",
    "linker_set_key" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-787"
+     "referenced_type" : "type-321"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10685,28 +13337,721 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhmPKymPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-989"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
+   "return_type" : "type-3449",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::clearCaller",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::stopProcess",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setupPolling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-476"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::flushCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearLastError",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::executeCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-476"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-3455"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-426"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-476"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEl",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-265"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::self",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
+   "return_type" : "type-3449",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::process",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-445",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::shutdown",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::transact",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::sendReply",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3449"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
    "function_name" : "android::hardware::readFromParcel",
    "linker_set_key" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10715,31 +14060,49 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-266",
+   "return_type" : "type-72",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::release_object",
+   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3431"
+    },
+    {
+     "referenced_type" : "type-3585"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::interfacesEqual",
    "linker_set_key" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_",
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::handleBinderPoll",
    "linker_set_key" : "_ZN7android8hardware16handleBinderPollEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10748,37 +14111,174 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
+   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
+   "return_type" : "type-2318",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::print",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "referenced_type" : "type-41"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::addPostCommandTask",
    "linker_set_key" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-324"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::setupBinderPolling",
    "linker_set_key" : "_ZN7android8hardware18setupBinderPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10787,10 +14287,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10800,17 +14300,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-931"
+     "referenced_type" : "type-487"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-490"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10820,10 +14320,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-931"
+     "referenced_type" : "type-487"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10833,16 +14333,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-931"
+     "referenced_type" : "type-487"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10851,22 +14351,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::setupTransportPolling",
    "linker_set_key" : "_ZN7android8hardware21setupTransportPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10875,19 +14375,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10896,19 +14396,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10917,19 +14417,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10938,13 +14438,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10953,19 +14453,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10974,19 +14474,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10995,19 +14495,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11016,28 +14516,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-72",
+   "return_type" : "type-384",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11047,13 +14547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-315"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11063,10 +14563,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
-   "return_type" : "type-359",
+   "return_type" : "type-307",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11076,19 +14576,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11098,19 +14598,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11119,25 +14619,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11146,22 +14646,950 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-119"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::Parcel::writeFloat",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-238"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-151"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64El",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-265"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::finishWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvmPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeDouble",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-6"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeObject",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-3585"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3903" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-71"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Em",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::restartWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeCString",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInplace",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::writePointer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::continueWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-288"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-3582"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUnpadded",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::acquireObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::freeDataNoInit",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::releaseObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPmmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataCapacity",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeWeakBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-3566"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeStrongBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-693"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhmPKymPFvPS1_S3_mS5_mPvES7_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-989"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-2164"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-2162"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvmPmmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
+   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::incrementNumReferences",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPmmmmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
+   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlemm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPmmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::write",
+   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::remove",
+   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-989"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::freeData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::growData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setError",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::initState",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBool",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "referenced_type" : "type-484"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2158"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::fromStatusT",
    "linker_set_key" : "_ZN7android8hardware6Status11fromStatusTEi",
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11171,16 +15599,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11190,13 +15618,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11205,10 +15633,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11217,19 +15645,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "function_name" : "android::hardware::Status::ok",
    "linker_set_key" : "_ZN7android8hardware6Status2okEv",
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11240,16 +15668,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11260,19 +15688,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11283,16 +15711,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11303,35 +15731,162 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2298"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2298"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-2143",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-2146",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::TaskRunner::push",
    "linker_set_key" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-249"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11341,13 +15896,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11357,10 +15912,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11370,10 +15925,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11383,10 +15938,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11396,16 +15951,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "function_name" : "android::hardware::details::debuggable",
    "linker_set_key" : "_ZN7android8hardware7details10debuggableEv",
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11414,18 +15969,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-944",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-114", "type-35", "type-261" ]
+   "template_args" : [ "type-505", "type-302", "type-829" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11433,18 +15988,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1053",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-148", "type-35", "type-249" ]
+   "template_args" : [ "type-496", "type-302", "type-821" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11452,18 +16007,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-35", "type-270" ]
+   "template_args" : [ "type-515", "type-302", "type-838" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11471,18 +16026,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1110",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-114", "type-270" ]
+   "template_args" : [ "type-515", "type-505", "type-838" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11490,18 +16045,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1715",
+   "return_type" : "type-1945",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-156", "type-35", "type-279" ]
+   "template_args" : [ "type-499", "type-302", "type-847" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11509,18 +16064,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-35", "type-130" ]
+   "template_args" : [ "type-518", "type-302", "type-727" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11528,18 +16083,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-114", "type-130" ]
+   "template_args" : [ "type-518", "type-505", "type-727" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11547,18 +16102,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1781",
+   "return_type" : "type-2015",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-113", "type-130" ]
+   "template_args" : [ "type-518", "type-515", "type-727" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -11566,10 +16121,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-1120",
+   "return_type" : "type-1490",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -11579,10 +16134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11592,10 +16147,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11605,13 +16160,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     },
     {
-     "referenced_type" : "type-452"
+     "referenced_type" : "type-114"
     }
    ],
-   "return_type" : "type-694",
+   "return_type" : "type-206",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11620,10 +16175,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11632,12 +16187,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-35", "type-108" ]
+   "template_args" : [ "type-302", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11645,12 +16200,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-148", "type-108" ]
+   "template_args" : [ "type-496", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11658,12 +16213,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-156", "type-108" ]
+   "template_args" : [ "type-499", "type-77" ]
   },
   {
    "access" : "protected",
@@ -11673,13 +16228,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-142"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11690,14 +16245,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11708,13 +16263,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11724,16 +16279,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11743,16 +16298,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11762,10 +16317,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11775,10 +16330,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11788,10 +16343,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-999"
+     "referenced_type" : "type-584"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11800,23 +16355,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-250",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
    "function_name" : "android::hardware::details::getPidIfSharable",
    "linker_set_key" : "_ZN7android8hardware7details16getPidIfSharableEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -11825,19 +16380,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::details::getVndkVersionStr",
    "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv",
-   "return_type" : "type-1121",
+   "return_type" : "type-630",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11846,18 +16401,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1008"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-527",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-261", "type-114", "type-108", "type-108" ]
+   "template_args" : [ "type-829", "type-505", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11865,18 +16420,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1073"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-543",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-249", "type-148", "type-108", "type-108" ]
+   "template_args" : [ "type-821", "type-496", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11884,18 +16439,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1131"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-532",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-270", "type-113", "type-108", "type-108" ]
+   "template_args" : [ "type-838", "type-515", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11903,18 +16458,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1968"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-549",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-279", "type-156", "type-108", "type-108" ]
+   "template_args" : [ "type-847", "type-499", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11922,29 +16477,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1806"
+     "referenced_type" : "type-2044"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-538",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-130", "type-129", "type-108", "type-108" ]
+   "template_args" : [ "type-727", "type-518", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-320",
+   "return_type" : "type-883",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-326",
+   "return_type" : "type-884",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -11953,19 +16508,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11974,10 +16529,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -11986,10 +16541,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11998,28 +16553,363 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-805"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::onTransact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2633"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-2170"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-2143",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-2172"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-905"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-2175",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2158"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2634"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "referenced_type" : "type-3716"
+    }
+   ],
+   "return_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "referenced_type" : "type-3715"
+    }
+   ],
+   "return_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::operator<<",
    "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-58"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-191",
+   "return_type" : "type-58",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12028,26 +16918,58 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-692"
+     "referenced_type" : "type-204"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     }
    ],
-   "return_type" : "type-692",
+   "return_type" : "type-204",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::BpHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2185"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2238"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::hidl_handle::getNativeHandle",
    "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12057,10 +16979,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12070,10 +16992,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12083,10 +17005,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-19",
+   "return_type" : "type-16",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12096,10 +17018,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-100",
+   "return_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12109,10 +17031,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12122,37 +17044,1519 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-1136",
+   "return_type" : "type-642",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::isContextManager",
+   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3664"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isServingCall",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3452"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
+   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2321"
+    }
+   ],
+   "return_type" : "type-2282",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::clearCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::errorCheck",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::findBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3594"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3593"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-6",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-3597",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3904" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3589"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3590"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::scanForFds",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcDataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readCString",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-78",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::updateCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataCapacity",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::objectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-297"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcBufferSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPmPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3598"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readWeakBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-2194",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::quickFindBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::enforceInterface",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-436"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-384",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEmPmmmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEmPmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::verifyBufferObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectmjmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3602"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16Inplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-288",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferChild",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferParent",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPmmmPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3598"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3599"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEmmPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3599"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-436"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEmPmmmPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3598"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3599"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebmm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3599"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEmmPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-3599"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::data",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-989",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::read",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::print",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcData",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::objects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-2164",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3587"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataAvail",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3592"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-238",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3588"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-476"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPl",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-3591"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3579"
+    },
+    {
+     "referenced_type" : "type-231"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::description",
    "linker_set_key" : "_ZNK7android8hardware6Status11descriptionEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-111"
     }
    ],
-   "return_type" : "type-1137",
+   "return_type" : "type-643",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::IBinder::checkSubclass",
+   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2142"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::return_status::assertOk",
    "linker_set_key" : "_ZNK7android8hardware7details13return_status8assertOkEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-118"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2174"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::getHWBinderKernelReferences",
+   "linker_set_key" : "getHWBinderKernelReferences",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "referenced_type" : "type-1001"
+    }
+   ],
+   "return_type" : "type-265",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printHexData",
+   "linker_set_key" : "printHexData",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-14"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-16"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3399"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printTypeCode",
+   "linker_set_key" : "printTypeCode",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3399"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::stringForIndent",
+   "linker_set_key" : "stringForIndent",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "global_vars" :
@@ -12160,80 +18564,116 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_020IServiceNotification10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceNotification::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_115IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_1::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IClientCallback10descriptorE",
    "name" : "android::hidl::manager::V1_2::IClientCallback::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_2::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_handle21kOffsetOfNativeHandleE",
    "name" : "android::hardware::hidl_handle::kOffsetOfNativeHandle",
-   "referenced_type" : "type-678",
+   "referenced_type" : "type-190",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-678",
+   "referenced_type" : "type-190",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-678",
+   "referenced_type" : "type-190",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-678",
+   "referenced_type" : "type-190",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
+   "name" : "android::hardware::gTextBuffers",
+   "referenced_type" : "type-2324",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
+   "name" : "android::hardware::gProcessMutex",
+   "referenced_type" : "type-394",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aerrE",
+   "name" : "android::hardware::aerr",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4alogE",
+   "name" : "android::hardware::alog",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aoutE",
+   "name" : "android::hardware::aout",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-1139",
+   "referenced_type" : "type-645",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-1140",
+   "referenced_type" : "type-646",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-822",
+   "referenced_type" : "type-361",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware8gProcessE",
+   "name" : "android::hardware::gProcess",
+   "referenced_type" : "type-2635",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
   }
  ],
  "lvalue_reference_types" :
@@ -12242,8 +18682,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-841",
-   "self_type" : "type-845",
+   "referenced_type" : "type-390",
+   "self_type" : "type-394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12251,17 +18691,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-851",
-   "self_type" : "type-856",
+   "referenced_type" : "type-400",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::RefBase *const &",
+   "name" : "android::RefBase *const &",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3443",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_type *const &",
+   "name" : "android::RefBase::weakref_type *const &",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3439",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-773",
+   "referenced_type" : "type-287",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12269,17 +18727,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-659",
+   "referenced_type" : "type-165",
+   "self_type" : "type-170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *const &",
+   "name" : "android::hardware::BHwBinder *const &",
+   "referenced_type" : "type-3416",
+   "self_type" : "type-3435",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
-   "referenced_type" : "type-30",
-   "self_type" : "type-50",
+   "referenced_type" : "type-663",
+   "self_type" : "type-675",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12287,8 +18754,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
-   "referenced_type" : "type-42",
-   "self_type" : "type-53",
+   "referenced_type" : "type-669",
+   "self_type" : "type-678",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12296,8 +18763,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-588",
+   "self_type" : "type-884",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -12305,17 +18772,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-347",
+   "self_type" : "type-883",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::HexDump &",
+   "name" : "android::hardware::HexDump &",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2299",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1220",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12323,8 +18799,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12332,17 +18808,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel &",
+   "name" : "android::hardware::Parcel &",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3696",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
+   "name" : "android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3646",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
-   "referenced_type" : "type-180",
-   "self_type" : "type-185",
+   "referenced_type" : "type-764",
+   "self_type" : "type-767",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12350,8 +18844,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-172",
-   "self_type" : "type-176",
+   "referenced_type" : "type-757",
+   "self_type" : "type-760",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12359,8 +18853,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-405",
+   "referenced_type" : "type-944",
+   "self_type" : "type-947",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12368,8 +18862,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1056",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12377,8 +18871,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
-   "referenced_type" : "type-615",
-   "self_type" : "type-618",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1113",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12386,8 +18880,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1948",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12395,8 +18889,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2018",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12404,8 +18898,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-411",
-   "self_type" : "type-739",
+   "referenced_type" : "type-250",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12413,8 +18907,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-497",
+   "referenced_type" : "type-120",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12422,17 +18916,71 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-106",
-   "self_type" : "type-418",
+   "referenced_type" : "type-103",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2287",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3304",
+   "self_type" : "type-3303",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3345",
+   "self_type" : "type-3344",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3659",
+   "self_type" : "type-3658",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-512",
+   "referenced_type" : "type-968",
+   "self_type" : "type-1035",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12440,8 +18988,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-508",
+   "referenced_type" : "type-572",
+   "self_type" : "type-1031",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12449,8 +18997,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-236",
+   "referenced_type" : "type-792",
+   "self_type" : "type-808",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12458,8 +19006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &",
    "name" : "android::hardware::details::hidl_pointer<const char> &",
-   "referenced_type" : "type-98",
-   "self_type" : "type-317",
+   "referenced_type" : "type-39",
+   "self_type" : "type-86",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12467,8 +19015,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-12",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-9",
+   "self_type" : "type-587",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12476,8 +19024,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-194",
-   "self_type" : "type-200",
+   "referenced_type" : "type-474",
+   "self_type" : "type-779",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12485,8 +19033,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &",
    "name" : "android::hardware::details::return_status &",
-   "referenced_type" : "type-105",
-   "self_type" : "type-694",
+   "referenced_type" : "type-112",
+   "self_type" : "type-206",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12494,8 +19042,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-516",
+   "referenced_type" : "type-971",
+   "self_type" : "type-1038",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12503,8 +19051,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &",
    "name" : "android::hardware::hidl_handle &",
-   "referenced_type" : "type-77",
-   "self_type" : "type-88",
+   "referenced_type" : "type-28",
+   "self_type" : "type-34",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12512,8 +19060,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-203",
-   "self_type" : "type-226",
+   "referenced_type" : "type-60",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12521,8 +19069,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-190",
+   "referenced_type" : "type-38",
+   "self_type" : "type-57",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12530,8 +19078,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-439",
+   "referenced_type" : "type-967",
+   "self_type" : "type-976",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12539,8 +19087,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-429",
+   "referenced_type" : "type-571",
+   "self_type" : "type-966",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12548,8 +19096,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-991",
-   "self_type" : "type-995",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12557,8 +19105,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-206",
-   "self_type" : "type-208",
+   "referenced_type" : "type-473",
+   "self_type" : "type-785",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12566,17 +19114,62 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-241",
+   "referenced_type" : "type-503",
+   "self_type" : "type-813",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3632",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2209",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
+   "name" : "android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3445",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2309",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-72",
-   "self_type" : "type-889",
+   "referenced_type" : "type-384",
+   "self_type" : "type-439",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
+   "name" : "android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-445",
+   "self_type" : "type-3657",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12584,8 +19177,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-161",
+   "referenced_type" : "type-743",
+   "self_type" : "type-746",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12593,8 +19186,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-356",
-   "self_type" : "type-399",
+   "referenced_type" : "type-907",
+   "self_type" : "type-942",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12602,8 +19195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-300",
+   "self_type" : "type-612",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12611,8 +19204,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-258",
-   "self_type" : "type-392",
+   "referenced_type" : "type-527",
+   "self_type" : "type-935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12620,8 +19213,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-395",
+   "referenced_type" : "type-543",
+   "self_type" : "type-938",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12629,8 +19222,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-124",
+   "referenced_type" : "type-532",
+   "self_type" : "type-725",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12638,8 +19231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-549",
+   "self_type" : "type-1943",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12647,8 +19240,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-127",
-   "self_type" : "type-140",
+   "referenced_type" : "type-538",
+   "self_type" : "type-733",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12656,8 +19249,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-797",
-   "self_type" : "type-875",
+   "referenced_type" : "type-331",
+   "self_type" : "type-425",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2216",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
+   "name" : "android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-3571",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12665,17 +19276,269 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-33",
-   "self_type" : "type-865",
+   "referenced_type" : "type-309",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "char *const &",
+   "name" : "char *const &",
+   "referenced_type" : "type-3606",
+   "self_type" : "type-3607",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[10]",
+   "name" : "char const (&)[10]",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3470",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[11]",
+   "name" : "char const (&)[11]",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3495",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[12]",
+   "name" : "char const (&)[12]",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3466",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[13]",
+   "name" : "char const (&)[13]",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3462",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[14]",
+   "name" : "char const (&)[14]",
+   "referenced_type" : "type-3512",
+   "self_type" : "type-3514",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[15]",
+   "name" : "char const (&)[15]",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3613",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[16]",
+   "name" : "char const (&)[16]",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[17]",
+   "name" : "char const (&)[17]",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3517",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[18]",
+   "name" : "char const (&)[18]",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3502",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[19]",
+   "name" : "char const (&)[19]",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3533",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[20]",
+   "name" : "char const (&)[20]",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3511",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[22]",
+   "name" : "char const (&)[22]",
+   "referenced_type" : "type-3534",
+   "self_type" : "type-3536",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[25]",
+   "name" : "char const (&)[25]",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[28]",
+   "name" : "char const (&)[28]",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3548",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[29]",
+   "name" : "char const (&)[29]",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[2]",
+   "name" : "char const (&)[2]",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3474",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[31]",
+   "name" : "char const (&)[31]",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3508",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[32]",
+   "name" : "char const (&)[32]",
+   "referenced_type" : "type-3537",
+   "self_type" : "type-3540",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[35]",
+   "name" : "char const (&)[35]",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3530",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[37]",
+   "name" : "char const (&)[37]",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3520",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[3]",
+   "name" : "char const (&)[3]",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3489",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[4]",
+   "name" : "char const (&)[4]",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3610",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[5]",
+   "name" : "char const (&)[5]",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[6]",
+   "name" : "char const (&)[6]",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3478",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[7]",
+   "name" : "char const (&)[7]",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3505",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[8]",
+   "name" : "char const (&)[8]",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3492",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "char const (&)[9]",
+   "name" : "char const (&)[9]",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3481",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-770",
-   "self_type" : "type-772",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12683,35 +19546,44 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-167",
+   "self_type" : "type-169",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1199",
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
+   "name" : "const android::hardware::BpHwBinder::Obituary &",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2227",
    "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2211",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::HexDump &",
+   "name" : "const android::hardware::HexDump &",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-3716",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1086",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12719,8 +19591,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1144",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12728,8 +19600,44 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1782",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1864",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1920",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1986",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -12737,8 +19645,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2039",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12746,8 +19654,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2093",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -12755,8 +19663,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2367",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12764,8 +19681,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-473",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2923",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12773,8 +19690,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-588",
-   "self_type" : "type-590",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3005",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12782,8 +19699,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-646",
-   "self_type" : "type-648",
+   "referenced_type" : "type-3059",
+   "self_type" : "type-3061",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12791,17 +19708,71 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3125",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-316",
+   "self_type" : "type-318",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3176",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3227",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3690",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-998",
+   "self_type" : "type-1000",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
+   "name" : "const android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-3625",
+   "self_type" : "type-3647",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "type-460",
+   "self_type" : "type-951",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12809,8 +19780,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-109",
+   "referenced_type" : "type-714",
+   "self_type" : "type-715",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12818,17 +19789,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-413",
+   "referenced_type" : "type-107",
+   "self_type" : "type-108",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::TypeCode &",
+   "name" : "const android::hardware::TypeCode &",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-3715",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-483",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12836,8 +19816,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-11",
-   "self_type" : "type-76",
+   "referenced_type" : "type-8",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12845,8 +19825,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-492",
+   "self_type" : "type-786",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12854,8 +19834,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-80",
+   "referenced_type" : "type-31",
+   "self_type" : "type-32",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12863,8 +19843,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-222",
-   "self_type" : "type-223",
+   "referenced_type" : "type-62",
+   "self_type" : "type-63",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12872,8 +19852,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-143",
-   "self_type" : "type-151",
+   "referenced_type" : "type-47",
+   "self_type" : "type-48",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12881,8 +19861,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2096",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12890,8 +19870,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1002",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12899,8 +19879,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-445",
-   "self_type" : "type-477",
+   "referenced_type" : "type-981",
+   "self_type" : "type-1003",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12908,8 +19888,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-996",
-   "self_type" : "type-998",
+   "referenced_type" : "type-581",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12917,8 +19897,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-921",
-   "self_type" : "type-923",
+   "referenced_type" : "type-477",
+   "self_type" : "type-479",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12926,8 +19906,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-277",
-   "self_type" : "type-292",
+   "referenced_type" : "type-73",
+   "self_type" : "type-75",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12935,8 +19915,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &",
    "name" : "const android::hidl::base::V1_0::IBase *const &",
-   "referenced_type" : "type-811",
-   "self_type" : "type-812",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12944,26 +19924,134 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-510",
+   "referenced_type" : "type-980",
+   "self_type" : "type-1033",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3622",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2197",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
+   "name" : "const android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2170",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2218",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3290",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2336",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3388",
+   "self_type" : "type-3390",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3397",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-440",
+   "self_type" : "type-693",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
+   "name" : "const android::sp<android::hardware::IInterface> &",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-117",
-   "self_type" : "type-123",
+   "referenced_type" : "type-718",
+   "self_type" : "type-724",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
+   "name" : "const android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-450",
+   "self_type" : "type-3431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12971,8 +20059,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-361",
+   "referenced_type" : "type-906",
+   "self_type" : "type-909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12980,8 +20068,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-80",
+   "self_type" : "type-79",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12989,8 +20077,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
+   "referenced_type" : "type-411",
+   "self_type" : "type-413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12998,8 +20086,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "type-530",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13007,8 +20095,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-546",
+   "self_type" : "type-737",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13016,8 +20104,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "type-535",
+   "self_type" : "type-717",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13025,8 +20113,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-554",
+   "self_type" : "type-741",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13034,8 +20122,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-541",
+   "self_type" : "type-726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13043,8 +20131,53 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-874",
+   "referenced_type" : "type-423",
+   "self_type" : "type-424",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1214",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2364",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3566",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13052,26 +20185,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1196",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1910",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-781",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3660",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13079,8 +20194,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-868",
-   "self_type" : "type-869",
+   "referenced_type" : "type-418",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13088,8 +20203,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-415",
+   "self_type" : "type-689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13097,13 +20212,31 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-905",
-   "self_type" : "type-924",
+   "referenced_type" : "type-456",
+   "self_type" : "type-480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const char &",
+   "name" : "const char &",
+   "referenced_type" : "type-42",
+   "self_type" : "type-2306",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const char *const &",
+   "name" : "const char *const &",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-5",
@@ -13113,10 +20246,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const flat_binder_object &",
+   "name" : "const flat_binder_object &",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3585",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13124,227 +20266,332 @@
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-441",
-   "self_type" : "type-993",
+   "referenced_type" : "type-569",
+   "self_type" : "type-578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1064",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1121",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1197",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1249",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1302",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1372",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1502",
+   "self_type" : "type-1504",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1543",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1611",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1681",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1755",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1897",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1957",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2029",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2075",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1998",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2348",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2451",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-201",
-   "self_type" : "type-204",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2521",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2068",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2645",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-246",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2684",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-272",
+   "self_type" : "type-274",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-419",
-   "self_type" : "type-421",
+   "referenced_type" : "type-2750",
+   "self_type" : "type-2752",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-557",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2784",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-624",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2822",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-751",
-   "self_type" : "type-753",
+   "referenced_type" : "type-2894",
+   "self_type" : "type-2896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-85",
-   "self_type" : "type-87",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2983",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-918",
-   "self_type" : "type-920",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3038",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3096",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3164",
+   "self_type" : "type-3166",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3208",
+   "self_type" : "type-3210",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3259",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3412",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3794",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3864",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-470",
+   "self_type" : "type-472",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-567",
+   "self_type" : "type-570",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-654",
+   "self_type" : "type-656",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-67",
+   "self_type" : "type-69",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-702",
+   "self_type" : "type-704",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-780",
+   "self_type" : "type-782",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-810",
+   "self_type" : "type-818",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-874",
+   "self_type" : "type-876",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-959",
+   "self_type" : "type-961",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-671",
-   "self_type" : "type-673",
+   "referenced_type" : "type-182",
+   "self_type" : "type-184",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13352,8 +20599,8 @@
    "alignment" : 8,
    "linker_set_key" : "const long &",
    "name" : "const long &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-605",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13361,8 +20608,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-981",
+   "referenced_type" : "type-548",
+   "self_type" : "type-561",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13370,8 +20617,8 @@
    "alignment" : 8,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-927",
-   "self_type" : "type-935",
+   "referenced_type" : "type-483",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13379,8 +20626,35 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1008",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1073",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1131",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1244",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13388,44 +20662,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1181",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1152",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1216",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1222",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1315",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13433,8 +20671,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1393",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13442,35 +20680,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1545",
    "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1547",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1618",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1591",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13478,8 +20698,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1630",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1790",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13487,8 +20716,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1851",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13496,8 +20725,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1905",
+   "self_type" : "type-1907",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13505,8 +20734,35 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1968",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2",
+   "self_type" : "type-35",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2044",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2090",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -13514,8 +20770,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1938",
-   "self_type" : "type-1940",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13523,17 +20779,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-89",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2011",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2464",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13541,8 +20788,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2542",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13550,8 +20797,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2686",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13559,8 +20806,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-2723",
+   "self_type" : "type-2732",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2769",
+   "self_type" : "type-2771",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -13568,8 +20824,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2929",
+   "self_type" : "type-2931",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13577,8 +20833,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-572",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2990",
+   "self_type" : "type-2992",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13586,8 +20842,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3048",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13595,8 +20851,35 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-819",
-   "self_type" : "type-821",
+   "referenced_type" : "type-3105",
+   "self_type" : "type-3107",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3181",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3222",
+   "self_type" : "type-3224",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-358",
+   "self_type" : "type-360",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13604,17 +20887,89 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-932",
-   "self_type" : "type-934",
+   "referenced_type" : "type-3734",
+   "self_type" : "type-3736",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3805",
+   "self_type" : "type-3807",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3883",
+   "self_type" : "type-3885",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-488",
+   "self_type" : "type-490",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-52",
+   "self_type" : "type-54",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-599",
+   "self_type" : "type-601",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-647",
+   "self_type" : "type-706",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-751",
+   "self_type" : "type-761",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-803",
+   "self_type" : "type-805",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1385",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13622,8 +20977,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2534",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13631,8 +20986,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13640,8 +21004,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1212",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1237",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13649,8 +21013,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2387",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13658,8 +21022,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-353",
+   "self_type" : "type-352",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
+   "name" : "const std::function<sp<IBinder> (void *)> &",
+   "referenced_type" : "type-3730",
+   "self_type" : "type-3729",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13667,8 +21040,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1186",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13676,8 +21049,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2119",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13685,17 +21058,44 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-733",
-   "self_type" : "type-735",
+   "referenced_type" : "type-247",
+   "self_type" : "type-249",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3253",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3453",
+   "self_type" : "type-3455",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3582",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1619",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13703,8 +21103,17 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-211",
-   "self_type" : "type-214",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2760",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-787",
+   "self_type" : "type-790",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13712,8 +21121,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1039",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13721,8 +21130,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1089",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13730,8 +21139,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13739,8 +21148,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13748,8 +21157,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1227",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13757,8 +21166,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1263",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13766,8 +21175,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1296",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1400",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13775,8 +21184,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13784,8 +21193,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1550",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13793,8 +21202,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13802,8 +21211,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-163",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13811,8 +21220,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13820,8 +21229,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13829,8 +21238,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1698",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13838,8 +21247,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-164",
-   "self_type" : "type-163",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13847,8 +21256,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1639",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13856,44 +21265,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1699",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1870",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13910,8 +21283,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13919,8 +21292,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2097",
-   "self_type" : "type-2096",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13928,8 +21301,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13937,8 +21310,161 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2129",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2691",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2720",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2836",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2840",
+   "self_type" : "type-2839",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2960",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3008",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3026",
+   "self_type" : "type-3025",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3065",
+   "self_type" : "type-3064",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3194",
+   "self_type" : "type-3193",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13955,8 +21481,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13964,8 +21490,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-517",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3828",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13973,8 +21499,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13982,8 +21508,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13991,8 +21517,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-613",
-   "self_type" : "type-612",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14000,8 +21526,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
+   "referenced_type" : "type-610",
+   "self_type" : "type-609",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14009,8 +21535,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-804",
-   "self_type" : "type-803",
+   "referenced_type" : "type-686",
+   "self_type" : "type-685",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14018,8 +21544,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "type-712",
+   "self_type" : "type-711",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14027,8 +21553,44 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-894",
+   "self_type" : "type-893",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-91",
+   "self_type" : "type-90",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14036,17 +21598,26 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-966",
+   "referenced_type" : "type-523",
+   "self_type" : "type-537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const unsigned char *const &",
+   "name" : "const unsigned char *const &",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3542",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-677",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-189",
+   "self_type" : "type-597",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14054,17 +21625,44 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-678",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-190",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const unsigned long *const &",
+   "name" : "const unsigned long *const &",
+   "referenced_type" : "type-3543",
+   "self_type" : "type-3545",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const unsigned long long &",
+   "name" : "const unsigned long long &",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-3467",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-982",
-   "self_type" : "type-986",
+   "referenced_type" : "type-562",
+   "self_type" : "type-566",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const void *const &",
+   "name" : "const void *const &",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14072,8 +21670,8 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-761",
+   "referenced_type" : "type-14",
+   "self_type" : "type-284",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14081,17 +21679,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1174",
+   "self_type" : "type-1173",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14099,8 +21688,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14108,8 +21697,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2022",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14117,8 +21706,26 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "type-205",
+   "self_type" : "type-204",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2744",
+   "self_type" : "type-2743",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14126,19 +21733,91 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3365",
+   "self_type" : "type-3364",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3551",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-946",
+   "referenced_type" : "type-146",
+   "self_type" : "type-508",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *const &",
+   "name" : "void *const &",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3484",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   }
  ],
  "pointer_types" :
@@ -14147,8 +21826,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CallStack *",
    "name" : "android::CallStack *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-687",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14156,8 +21835,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CallStack::StackDeleter *",
    "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-691",
+   "referenced_type" : "type-202",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14165,17 +21844,89 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-847",
-   "self_type" : "type-850",
+   "referenced_type" : "type-396",
+   "self_type" : "type-399",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3447",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-383",
+   "self_type" : "type-3648",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2229",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-841",
-   "self_type" : "type-843",
+   "referenced_type" : "type-390",
+   "self_type" : "type-392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14183,8 +21934,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-844",
-   "self_type" : "type-846",
+   "referenced_type" : "type-393",
+   "self_type" : "type-395",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14192,8 +21943,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-854",
+   "referenced_type" : "type-400",
+   "self_type" : "type-403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14201,8 +21952,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-855",
-   "self_type" : "type-857",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14210,8 +21961,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-859",
-   "self_type" : "type-860",
+   "referenced_type" : "type-408",
+   "self_type" : "type-409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14219,8 +21970,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-66",
+   "referenced_type" : "type-18",
+   "self_type" : "type-25",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase **",
+   "name" : "android::RefBase **",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3415",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase *const *",
+   "name" : "android::RefBase *const *",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3421",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1059",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14228,8 +22006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14237,8 +22015,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14246,8 +22024,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14255,8 +22033,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14264,8 +22042,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14273,8 +22051,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14282,8 +22060,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14291,8 +22069,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14300,8 +22078,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14309,8 +22087,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1749",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14318,8 +22096,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14327,8 +22105,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14336,8 +22114,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14345,8 +22123,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2024",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14354,8 +22132,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2070",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14363,8 +22141,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-21",
+   "self_type" : "type-20",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14372,8 +22150,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1879",
-   "self_type" : "type-1878",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14381,8 +22159,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14390,8 +22168,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14399,8 +22177,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14408,8 +22186,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14417,8 +22195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14426,8 +22204,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14435,8 +22213,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14444,8 +22222,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14453,8 +22231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-267",
+   "self_type" : "type-266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14462,8 +22240,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14471,8 +22249,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "type-2747",
+   "self_type" : "type-2746",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14480,8 +22258,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-913",
-   "self_type" : "type-912",
+   "referenced_type" : "type-2817",
+   "self_type" : "type-2816",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14489,8 +22267,242 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-984",
-   "self_type" : "type-983",
+   "referenced_type" : "type-2891",
+   "self_type" : "type-2890",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2979",
+   "self_type" : "type-2978",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3034",
+   "self_type" : "type-3033",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3206",
+   "self_type" : "type-3205",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3321",
+   "self_type" : "type-3320",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3370",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3401",
+   "self_type" : "type-3400",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3429",
+   "self_type" : "type-3428",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3699",
+   "self_type" : "type-3698",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3790",
+   "self_type" : "type-3789",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3858",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-699",
+   "self_type" : "type-698",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14498,17 +22510,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-22",
+   "self_type" : "type-308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_type **",
+   "name" : "android::RefBase::weakref_type **",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3414",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_type *const *",
+   "name" : "android::RefBase::weakref_type *const *",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3419",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-23",
+   "referenced_type" : "type-7",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14516,17 +22546,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-501",
-   "self_type" : "type-502",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-376",
+   "self_type" : "type-3639",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2219",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-774",
+   "referenced_type" : "type-287",
+   "self_type" : "type-297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14534,8 +22582,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-660",
+   "referenced_type" : "type-165",
+   "self_type" : "type-171",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14543,17 +22591,125 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::RefBase *> *",
+   "name" : "android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3440",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3436",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::Vector<android::String8> *",
    "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-682",
-   "self_type" : "type-683",
+   "referenced_type" : "type-194",
+   "self_type" : "type-195",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3432",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2150",
+   "self_type" : "type-2149",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2224",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3279",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3456",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-378",
+   "self_type" : "type-3642",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2331",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2329",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14561,8 +22717,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-509",
+   "referenced_type" : "type-126",
+   "self_type" : "type-127",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -14570,6 +22726,24 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1096",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
    "referenced_type" : "type-1226",
    "self_type" : "type-1225",
    "size" : 8,
@@ -14579,8 +22753,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1567",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14588,8 +22762,89 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1822",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1927",
+   "self_type" : "type-1926",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2001",
+   "self_type" : "type-2000",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2059",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2143",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2709",
+   "self_type" : "type-2708",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14597,8 +22852,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14606,8 +22861,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14615,8 +22870,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2963",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14624,8 +22879,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1650",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-3016",
+   "self_type" : "type-3015",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14633,8 +22888,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1703",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14642,8 +22897,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14651,8 +22906,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1822",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-3197",
+   "self_type" : "type-3196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14660,8 +22915,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14669,8 +22924,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14678,8 +22933,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14687,35 +22951,143 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "linker_set_key" : "android::hardware::BHwBinder **",
+   "name" : "android::hardware::BHwBinder **",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-3413",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "linker_set_key" : "android::hardware::BHwBinder *const *",
+   "name" : "android::hardware::BHwBinder *const *",
+   "referenced_type" : "type-3416",
+   "self_type" : "type-3417",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-3296",
+   "self_type" : "type-3295",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BpHwBinder *",
+   "name" : "android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2146",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
+   "name" : "android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2201",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2236",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BpHwRefBase *",
+   "name" : "android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2181",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput *",
+   "name" : "android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2317",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-39",
+   "referenced_type" : "type-663",
+   "self_type" : "type-666",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14723,8 +23095,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-46",
+   "referenced_type" : "type-669",
+   "self_type" : "type-672",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14732,8 +23104,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-806",
+   "referenced_type" : "type-326",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14741,8 +23113,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-588",
+   "self_type" : "type-603",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14750,8 +23122,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-825",
+   "referenced_type" : "type-347",
+   "self_type" : "type-365",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14759,17 +23131,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-262",
+   "self_type" : "type-261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::HexDump *",
+   "name" : "android::hardware::HexDump *",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::HidlMemory *",
    "name" : "android::hardware::HidlMemory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14777,8 +23158,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1046",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14786,8 +23167,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1101",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14795,8 +23176,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14804,8 +23185,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14813,8 +23194,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1338",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14822,8 +23203,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1530",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14831,8 +23212,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14840,8 +23221,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14849,8 +23230,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1721",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14858,8 +23239,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1654",
-   "self_type" : "type-1653",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14867,8 +23248,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14876,8 +23257,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14885,8 +23266,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2006",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14894,8 +23275,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14903,8 +23284,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14912,8 +23293,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2036",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2140",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14921,8 +23302,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14930,8 +23311,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14939,8 +23320,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-345",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2553",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14948,8 +23329,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14957,8 +23338,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2808",
+   "self_type" : "type-2807",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14966,8 +23347,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14975,8 +23356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14984,8 +23365,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "type-2967",
+   "self_type" : "type-2966",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14993,150 +23374,69 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-3020",
+   "self_type" : "type-3019",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1643",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1646",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1763",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1766",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-599",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1494",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3073",
+   "self_type" : "type-3072",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1587",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3145",
+   "self_type" : "type-3144",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1655",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3200",
+   "self_type" : "type-3199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1709",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3744",
+   "self_type" : "type-3743",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1828",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
    "referenced_type" : "type-386",
    "self_type" : "type-385",
    "size" : 8,
@@ -15144,10 +23444,217 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-614",
+   "self_type" : "type-613",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-862",
+   "self_type" : "type-861",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1092",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1705",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2114",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2192",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3011",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3013",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3134",
+   "self_type" : "type-3133",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3137",
+   "self_type" : "type-3136",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1048",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15155,17 +23662,152 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1827",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2067",
+   "self_type" : "type-2066",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-3408",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2866",
+   "self_type" : "type-2865",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2969",
+   "self_type" : "type-2968",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3022",
+   "self_type" : "type-3021",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3147",
+   "self_type" : "type-3146",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::IPCThreadState *",
+   "name" : "android::hardware::IPCThreadState *",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-3449",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-929",
-   "self_type" : "type-931",
+   "referenced_type" : "type-485",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -15173,8 +23815,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15182,17 +23824,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1543",
-   "size" : 8,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15200,8 +23833,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15209,8 +23842,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1865",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15218,8 +23887,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2040",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15227,8 +23896,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15236,8 +23905,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15245,8 +23923,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15254,8 +23932,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
+   "referenced_type" : "type-3007",
+   "self_type" : "type-3006",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15263,8 +23941,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-3063",
+   "self_type" : "type-3062",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15272,8 +23950,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3126",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15281,8 +23995,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1558",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15290,8 +24004,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-2700",
+   "self_type" : "type-2699",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::PassthroughServiceManager *",
+   "name" : "android::hardware::PassthroughServiceManager *",
+   "referenced_type" : "type-721",
+   "self_type" : "type-720",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::PoolThread *",
+   "name" : "android::hardware::PoolThread *",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15299,8 +24031,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15308,8 +24040,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1105",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15317,8 +24049,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15326,8 +24058,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15335,8 +24067,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15344,8 +24076,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1829",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15353,8 +24085,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15362,8 +24094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1937",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15371,8 +24103,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15380,8 +24112,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15389,8 +24121,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2254",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15398,8 +24130,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15407,8 +24139,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15416,17 +24148,107 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-2868",
+   "self_type" : "type-2867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2971",
+   "self_type" : "type-2970",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3024",
+   "self_type" : "type-3023",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3150",
+   "self_type" : "type-3149",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3782",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
+   "name" : "android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3623",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-764",
+   "self_type" : "type-765",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15434,8 +24256,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-174",
+   "referenced_type" : "type-757",
+   "self_type" : "type-758",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15443,8 +24265,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-944",
+   "self_type" : "type-945",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15452,8 +24274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1054",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15461,8 +24283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1111",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15470,8 +24292,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1946",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15479,8 +24301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2016",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15488,8 +24310,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-737",
+   "referenced_type" : "type-250",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15497,8 +24319,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-489",
+   "referenced_type" : "type-120",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15506,17 +24328,53 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-408",
+   "referenced_type" : "type-103",
+   "self_type" : "type-106",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2292",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput *",
+   "name" : "android::hardware::TextOutput *",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-3712",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
+   "name" : "android::hardware::TextOutput::Bundle *",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TypeCode *",
+   "name" : "android::hardware::TypeCode *",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2294",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15524,8 +24382,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2054",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2507",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15533,8 +24391,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-974",
-   "self_type" : "type-973",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
+   "name" : "android::hardware::details::ClientCounterCallback *",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15542,8 +24409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-51",
+   "referenced_type" : "type-673",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15551,8 +24418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-54",
+   "referenced_type" : "type-677",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15560,8 +24427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-361",
+   "self_type" : "type-363",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15569,8 +24436,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-602",
+   "self_type" : "type-604",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15578,8 +24445,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-827",
+   "referenced_type" : "type-364",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15587,8 +24454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-999",
+   "referenced_type" : "type-128",
+   "self_type" : "type-584",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15596,8 +24463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::TaskRunner *",
    "name" : "android::hardware::details::TaskRunner *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-726",
+   "referenced_type" : "type-209",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -15605,8 +24472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1571",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15614,8 +24481,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-149",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2712",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-739",
+   "self_type" : "type-738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15623,8 +24499,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-511",
+   "referenced_type" : "type-968",
+   "self_type" : "type-1034",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15632,8 +24508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-507",
+   "referenced_type" : "type-572",
+   "self_type" : "type-1030",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15641,8 +24517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-235",
+   "referenced_type" : "type-792",
+   "self_type" : "type-807",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15650,8 +24526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> *",
    "name" : "android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-314",
+   "referenced_type" : "type-39",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15659,8 +24535,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-937",
+   "referenced_type" : "type-9",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15668,8 +24544,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-474",
+   "self_type" : "type-775",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15677,8 +24553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-442",
+   "referenced_type" : "type-112",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15686,8 +24562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "type-971",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15695,8 +24571,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15704,8 +24580,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-83",
+   "self_type" : "type-82",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15713,8 +24589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-78",
+   "referenced_type" : "type-28",
+   "self_type" : "type-30",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15722,8 +24598,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-203",
-   "self_type" : "type-213",
+   "referenced_type" : "type-60",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15731,8 +24607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-122",
+   "referenced_type" : "type-38",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15740,8 +24616,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-436",
+   "referenced_type" : "type-967",
+   "self_type" : "type-973",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15749,8 +24625,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-571",
+   "self_type" : "type-963",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15758,8 +24634,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-221",
+   "referenced_type" : "type-791",
+   "self_type" : "type-795",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15767,8 +24643,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-994",
+   "referenced_type" : "type-576",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15776,8 +24652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-205",
+   "referenced_type" : "type-473",
+   "self_type" : "type-783",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15785,8 +24661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-266",
+   "referenced_type" : "type-70",
+   "self_type" : "type-72",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15794,8 +24670,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-776",
+   "referenced_type" : "type-299",
+   "self_type" : "type-304",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15803,8 +24679,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "type-369",
+   "self_type" : "type-919",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15812,8 +24688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2063",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15821,8 +24697,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15830,8 +24706,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-260",
+   "referenced_type" : "type-827",
+   "self_type" : "type-828",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
@@ -15839,8 +24715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-247",
-   "self_type" : "type-248",
+   "referenced_type" : "type-819",
+   "self_type" : "type-820",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15848,8 +24724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-371",
+   "referenced_type" : "type-829",
+   "self_type" : "type-918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15857,8 +24733,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-394",
+   "referenced_type" : "type-821",
+   "self_type" : "type-937",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15866,8 +24742,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-370",
+   "referenced_type" : "type-916",
+   "self_type" : "type-917",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15875,8 +24751,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-528",
-   "self_type" : "type-529",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1045",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15884,8 +24760,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-259",
+   "referenced_type" : "type-505",
+   "self_type" : "type-528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15893,8 +24769,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "type-503",
+   "self_type" : "type-794",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15902,8 +24778,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
+   "referenced_type" : "type-496",
+   "self_type" : "type-544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15911,8 +24787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-836",
+   "self_type" : "type-837",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15920,8 +24796,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-605",
+   "referenced_type" : "type-838",
+   "self_type" : "type-1100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15929,8 +24805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
    "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-604",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1099",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15938,8 +24814,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
    "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-515",
+   "self_type" : "type-533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15947,8 +24823,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-278",
+   "referenced_type" : "type-844",
+   "self_type" : "type-846",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15956,8 +24832,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-285",
+   "referenced_type" : "type-802",
+   "self_type" : "type-853",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
@@ -15965,8 +24841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-847",
+   "self_type" : "type-1930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15974,8 +24850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-139",
+   "referenced_type" : "type-727",
+   "self_type" : "type-732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15983,8 +24859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
    "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1929",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15992,8 +24868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
    "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2004",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16001,8 +24877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
    "name" : "android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-499",
+   "self_type" : "type-550",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16010,8 +24886,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "type-518",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3624",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2200",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::Thread> *",
+   "name" : "android::sp<android::Thread> *",
+   "referenced_type" : "type-453",
+   "self_type" : "type-3636",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16019,17 +24922,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-906",
+   "referenced_type" : "type-426",
+   "self_type" : "type-457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2314",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> *",
    "name" : "android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-366",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16037,8 +24949,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-380",
+   "referenced_type" : "type-921",
+   "self_type" : "type-923",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16046,8 +24958,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-886",
+   "referenced_type" : "type-384",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16055,8 +24967,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-157",
+   "referenced_type" : "type-719",
+   "self_type" : "type-742",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16064,8 +24976,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-894",
-   "self_type" : "type-898",
+   "referenced_type" : "type-445",
+   "self_type" : "type-449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16073,8 +24985,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-976",
-   "self_type" : "type-978",
+   "referenced_type" : "type-556",
+   "self_type" : "type-558",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16082,8 +24994,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-743",
+   "self_type" : "type-745",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16091,8 +25003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-397",
+   "referenced_type" : "type-907",
+   "self_type" : "type-940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16100,8 +25012,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-304",
-   "self_type" : "type-879",
+   "referenced_type" : "type-81",
+   "self_type" : "type-429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16109,8 +25021,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-884",
+   "referenced_type" : "type-300",
+   "self_type" : "type-434",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16118,8 +25030,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-962",
+   "referenced_type" : "type-527",
+   "self_type" : "type-529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16127,8 +25039,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-969",
+   "referenced_type" : "type-543",
+   "self_type" : "type-545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16136,8 +25048,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-964",
+   "referenced_type" : "type-532",
+   "self_type" : "type-534",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16145,8 +25057,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-972",
+   "referenced_type" : "type-549",
+   "self_type" : "type-551",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16154,8 +25066,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-127",
-   "self_type" : "type-967",
+   "referenced_type" : "type-538",
+   "self_type" : "type-540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16163,8 +25075,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-797",
-   "self_type" : "type-872",
+   "referenced_type" : "type-331",
+   "self_type" : "type-422",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16172,8 +25084,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-354",
+   "referenced_type" : "type-900",
+   "self_type" : "type-905",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
+   "name" : "android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16181,8 +25102,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-867",
+   "referenced_type" : "type-307",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16190,8 +25111,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-858",
+   "referenced_type" : "type-309",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16199,17 +25120,35 @@
    "alignment" : 8,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-716",
-   "self_type" : "type-720",
+   "referenced_type" : "type-230",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2243",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-3594",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-450",
+   "referenced_type" : "type-43",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16217,17 +25156,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CallStack *",
    "name" : "const android::CallStack *",
-   "referenced_type" : "type-688",
-   "self_type" : "type-689",
+   "referenced_type" : "type-200",
+   "self_type" : "type-201",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3651",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2231",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-756",
-   "self_type" : "type-757",
+   "referenced_type" : "type-278",
+   "self_type" : "type-279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -16235,17 +25192,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-63",
+   "referenced_type" : "type-23",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3641",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2221",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-771",
+   "referenced_type" : "type-293",
+   "self_type" : "type-294",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16253,17 +25228,80 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-657",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::RefBase *> *",
+   "name" : "const android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3442",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3438",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-684",
-   "self_type" : "type-685",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3434",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2226",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3645",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2333",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2326",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16271,17 +25309,71 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-680",
+   "referenced_type" : "type-191",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BHwBinder *",
+   "name" : "const android::hardware::BHwBinder *",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2174",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwBinder *",
+   "name" : "const android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2185",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
+   "name" : "const android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2204",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2238",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2183",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
+   "name" : "const android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2321",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-486",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1012",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16289,8 +25381,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-488",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1014",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16298,8 +25390,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-809",
-   "self_type" : "type-810",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16307,8 +25399,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-596",
+   "self_type" : "type-598",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16316,17 +25408,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-816",
-   "self_type" : "type-818",
+   "referenced_type" : "type-355",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::HexDump *",
+   "name" : "const android::hardware::HexDump *",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2301",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16334,8 +25435,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2142",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16343,17 +25453,80 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-891",
-   "self_type" : "type-893",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3781",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-442",
+   "self_type" : "type-444",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
+   "name" : "const android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2233",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IInterface *",
+   "name" : "const android::hardware::IInterface *",
+   "referenced_type" : "type-3410",
+   "self_type" : "type-3411",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::IPCThreadState *",
+   "name" : "const android::hardware::IPCThreadState *",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3452",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Parcel *",
+   "name" : "const android::hardware::Parcel *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-3579",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::ProcessState *",
+   "name" : "const android::hardware::ProcessState *",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3664",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
+   "name" : "const android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-3625",
+   "self_type" : "type-3626",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-187",
+   "referenced_type" : "type-768",
+   "self_type" : "type-769",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16361,8 +25534,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16370,8 +25543,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-407",
+   "referenced_type" : "type-948",
+   "self_type" : "type-949",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16379,8 +25552,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-547",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1058",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16388,8 +25561,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-620",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16397,8 +25570,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16406,8 +25579,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2020",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16415,8 +25588,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-909",
+   "referenced_type" : "type-460",
+   "self_type" : "type-461",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16424,17 +25597,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-412",
-   "self_type" : "type-422",
+   "referenced_type" : "type-107",
+   "self_type" : "type-111",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::TypeCode *",
+   "name" : "const android::hardware::TypeCode *",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2296",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16442,8 +25624,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-171",
+   "referenced_type" : "type-2726",
+   "self_type" : "type-2728",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-754",
+   "self_type" : "type-756",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16451,8 +25642,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1037",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16460,8 +25651,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-607",
+   "self_type" : "type-608",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16469,8 +25660,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-237",
-   "self_type" : "type-240",
+   "referenced_type" : "type-809",
+   "self_type" : "type-812",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16478,8 +25669,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char> *",
    "name" : "const android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-334",
+   "referenced_type" : "type-88",
+   "self_type" : "type-89",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16487,8 +25678,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-138",
+   "referenced_type" : "type-8",
+   "self_type" : "type-46",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16496,8 +25687,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-936",
+   "referenced_type" : "type-492",
+   "self_type" : "type-493",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16505,8 +25696,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-455",
-   "self_type" : "type-469",
+   "referenced_type" : "type-115",
+   "self_type" : "type-118",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16514,8 +25705,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16523,8 +25714,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-882",
-   "self_type" : "type-883",
+   "referenced_type" : "type-432",
+   "self_type" : "type-433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16532,8 +25723,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle *",
    "name" : "const android::hardware::hidl_handle *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-93",
+   "referenced_type" : "type-31",
+   "self_type" : "type-37",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16541,8 +25732,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-222",
-   "self_type" : "type-234",
+   "referenced_type" : "type-62",
+   "self_type" : "type-66",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16550,8 +25741,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-189",
+   "referenced_type" : "type-47",
+   "self_type" : "type-56",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16559,8 +25750,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2084",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16568,8 +25759,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-990",
+   "referenced_type" : "type-574",
+   "self_type" : "type-575",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16577,8 +25768,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-981",
+   "self_type" : "type-982",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16586,8 +25777,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-996",
-   "self_type" : "type-997",
+   "referenced_type" : "type-581",
+   "self_type" : "type-582",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16595,8 +25786,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-921",
-   "self_type" : "type-922",
+   "referenced_type" : "type-477",
+   "self_type" : "type-478",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16604,8 +25795,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-277",
-   "self_type" : "type-287",
+   "referenced_type" : "type-73",
+   "self_type" : "type-74",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16613,8 +25804,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-828",
-   "self_type" : "type-829",
+   "referenced_type" : "type-373",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -16622,8 +25813,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16631,8 +25822,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-833",
+   "self_type" : "type-835",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -16640,8 +25831,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-256",
+   "referenced_type" : "type-825",
+   "self_type" : "type-826",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -16649,8 +25840,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-504",
+   "self_type" : "type-506",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -16658,8 +25849,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-980",
+   "self_type" : "type-979",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16667,8 +25858,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-938",
-   "self_type" : "type-939",
+   "referenced_type" : "type-495",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16676,8 +25867,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-842",
+   "self_type" : "type-843",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -16685,8 +25876,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-952",
-   "self_type" : "type-953",
+   "referenced_type" : "type-514",
+   "self_type" : "type-516",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -16694,8 +25885,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-284",
+   "referenced_type" : "type-851",
+   "self_type" : "type-852",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -16703,8 +25894,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-854",
+   "self_type" : "type-856",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -16712,8 +25903,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-940",
-   "self_type" : "type-941",
+   "referenced_type" : "type-498",
+   "self_type" : "type-500",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -16721,17 +25912,71 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-955",
+   "referenced_type" : "type-517",
+   "self_type" : "type-519",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3627",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2202",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::Thread> *",
+   "name" : "const android::sp<android::Thread> *",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3650",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
+   "name" : "const android::sp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3459",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2315",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory> *",
    "name" : "const android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-390",
+   "referenced_type" : "type-100",
+   "self_type" : "type-101",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16739,8 +25984,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-890",
+   "referenced_type" : "type-440",
+   "self_type" : "type-441",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
+   "name" : "const android::sp<android::hardware::IInterface> *",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16748,8 +26002,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-899",
-   "self_type" : "type-900",
+   "referenced_type" : "type-450",
+   "self_type" : "type-451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16757,8 +26011,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-559",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16766,8 +26020,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-162",
-   "self_type" : "type-168",
+   "referenced_type" : "type-747",
+   "self_type" : "type-753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16775,8 +26029,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-400",
+   "referenced_type" : "type-906",
+   "self_type" : "type-943",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16784,8 +26038,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-303",
-   "self_type" : "type-393",
+   "referenced_type" : "type-80",
+   "self_type" : "type-102",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16793,8 +26047,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-862",
-   "self_type" : "type-885",
+   "referenced_type" : "type-411",
+   "self_type" : "type-435",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16802,8 +26056,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-299",
-   "self_type" : "type-963",
+   "referenced_type" : "type-530",
+   "self_type" : "type-531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16811,8 +26065,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-970",
+   "referenced_type" : "type-546",
+   "self_type" : "type-547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16820,8 +26074,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-965",
+   "referenced_type" : "type-535",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16829,8 +26083,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-975",
+   "referenced_type" : "type-554",
+   "self_type" : "type-555",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16838,8 +26092,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-968",
+   "referenced_type" : "type-541",
+   "self_type" : "type-542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16847,8 +26101,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-423",
+   "self_type" : "type-428",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2223",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
+   "name" : "const android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3573",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16856,8 +26128,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-868",
-   "self_type" : "type-870",
+   "referenced_type" : "type-418",
+   "self_type" : "type-420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16865,17 +26137,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-866",
+   "referenced_type" : "type-415",
+   "self_type" : "type-416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const binder_buffer_object *",
+   "name" : "const binder_buffer_object *",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3602",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16883,8 +26164,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16892,8 +26173,8 @@
    "alignment" : 8,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-116",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16901,8 +26182,8 @@
    "alignment" : 8,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1831",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16910,17 +26191,35 @@
    "alignment" : 8,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2972",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-995",
+   "self_type" : "type-1052",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const flat_binder_object *",
+   "name" : "const flat_binder_object *",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3597",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-569",
+   "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16928,8 +26227,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-671",
-   "self_type" : "type-672",
+   "referenced_type" : "type-182",
+   "self_type" : "type-183",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16937,35 +26236,89 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const native_handle **",
+   "name" : "const native_handle **",
+   "referenced_type" : "type-11",
+   "self_type" : "type-3599",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-523",
+   "self_type" : "type-989",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const unsigned long *",
+   "name" : "const unsigned long *",
+   "referenced_type" : "type-190",
+   "self_type" : "type-3544",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const unsigned long long *",
+   "name" : "const unsigned long long *",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2164",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-301",
+   "referenced_type" : "type-76",
+   "self_type" : "type-78",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const void **",
+   "name" : "const void **",
+   "referenced_type" : "type-78",
+   "self_type" : "type-3598",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "double *",
+   "name" : "double *",
+   "referenced_type" : "type-6",
+   "self_type" : "type-3593",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "float *",
+   "name" : "float *",
+   "referenced_type" : "type-238",
+   "self_type" : "type-3592",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-729",
-   "self_type" : "type-730",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16973,8 +26326,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-196",
+   "referenced_type" : "type-14",
+   "self_type" : "type-476",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16982,26 +26335,71 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-668",
-   "self_type" : "type-674",
+   "referenced_type" : "type-179",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "long *",
+   "name" : "long *",
+   "referenced_type" : "type-265",
+   "self_type" : "type-3591",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-90",
+   "referenced_type" : "type-13",
+   "self_type" : "type-36",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "short *",
+   "name" : "short *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-3588",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-484",
+   "self_type" : "type-3587",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2305",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3595",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1710",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17009,8 +26407,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2113",
-   "self_type" : "type-2112",
+   "referenced_type" : "type-2852",
+   "self_type" : "type-2851",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17018,8 +26416,17 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17027,26 +26434,80 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-717",
+   "referenced_type" : "type-146",
+   "self_type" : "type-231",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "unsigned int *",
+   "name" : "unsigned int *",
+   "referenced_type" : "type-44",
+   "self_type" : "type-3590",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-474",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1001",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "unsigned long long *",
+   "name" : "unsigned long long *",
+   "referenced_type" : "type-389",
+   "self_type" : "type-2161",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned short *",
+   "name" : "unsigned short *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-3589",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void (*)(const void *, void *, void *)",
+   "name" : "void (*)(const void *, void *, void *)",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void (*)(void *, const char *)",
+   "name" : "void (*)(void *, const char *)",
+   "referenced_type" : "type-3398",
+   "self_type" : "type-3399",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-676",
+   "referenced_type" : "type-77",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17054,8 +26515,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-676",
-   "self_type" : "type-732",
+   "referenced_type" : "type-188",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -17065,10 +26526,20 @@
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase *const",
+   "name" : "android::RefBase *const",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3420",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1145",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1061",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17077,8 +26548,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1118",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17087,8 +26558,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17097,8 +26568,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1299",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17107,8 +26578,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1275",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17117,8 +26588,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17127,8 +26598,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17137,8 +26608,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17147,8 +26618,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17157,8 +26628,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17167,8 +26638,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1749",
+   "self_type" : "type-1751",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17177,8 +26648,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1670",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17187,8 +26658,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1894",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17197,8 +26668,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1954",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17207,8 +26678,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2026",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17217,8 +26688,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1846",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2072",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17227,8 +26698,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17237,8 +26708,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-197",
-   "self_type" : "type-199",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2122",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17247,8 +26718,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17257,8 +26728,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2062",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17267,8 +26738,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17277,8 +26748,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-307",
-   "self_type" : "type-309",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17287,8 +26758,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17297,8 +26768,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-552",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17307,8 +26778,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2641",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17317,8 +26788,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-747",
-   "self_type" : "type-749",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17327,8 +26798,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7",
-   "self_type" : "type-9",
+   "referenced_type" : "type-266",
+   "self_type" : "type-268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17337,8 +26808,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-81",
-   "self_type" : "type-83",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17347,8 +26818,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-912",
-   "self_type" : "type-914",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2748",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17357,28 +26828,628 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-983",
-   "self_type" : "type-985",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2818",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2892",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2980",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3033",
+   "self_type" : "type-3035",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3091",
+   "self_type" : "type-3093",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3163",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3207",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3256",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3272",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3322",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3372",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3391",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3394",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3403",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3428",
+   "self_type" : "type-3430",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3569",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3635",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3700",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3791",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3860",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-464",
+   "self_type" : "type-466",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-563",
+   "self_type" : "type-565",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-650",
+   "self_type" : "type-652",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-698",
+   "self_type" : "type-700",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-776",
+   "self_type" : "type-778",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-870",
+   "self_type" : "type-872",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-955",
+   "self_type" : "type-957",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_type *const",
+   "name" : "android::RefBase::weakref_type *const",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3418",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::BHwBinder *const",
+   "name" : "android::hardware::BHwBinder *const",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-3416",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2178",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "char *const",
+   "name" : "char *const",
+   "referenced_type" : "type-186",
+   "self_type" : "type-3606",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[10]",
+   "name" : "char const[10]",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[11]",
+   "name" : "char const[11]",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[12]",
+   "name" : "char const[12]",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[13]",
+   "name" : "char const[13]",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[14]",
+   "name" : "char const[14]",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[15]",
+   "name" : "char const[15]",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[16]",
+   "name" : "char const[16]",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[17]",
+   "name" : "char const[17]",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[18]",
+   "name" : "char const[18]",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[19]",
+   "name" : "char const[19]",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[20]",
+   "name" : "char const[20]",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[22]",
+   "name" : "char const[22]",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[25]",
+   "name" : "char const[25]",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[28]",
+   "name" : "char const[28]",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[29]",
+   "name" : "char const[29]",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[2]",
+   "name" : "char const[2]",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3472",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[31]",
+   "name" : "char const[31]",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[32]",
+   "name" : "char const[32]",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[35]",
+   "name" : "char const[35]",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3528",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[37]",
+   "name" : "char const[37]",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[3]",
+   "name" : "char const[3]",
+   "referenced_type" : "type-3486",
+   "self_type" : "type-3485",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[4]",
+   "name" : "char const[4]",
+   "referenced_type" : "type-3609",
+   "self_type" : "type-3608",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[5]",
+   "name" : "char const[5]",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[6]",
+   "name" : "char const[6]",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[7]",
+   "name" : "char const[7]",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[8]",
+   "name" : "char const[8]",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[9]",
+   "name" : "char const[9]",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::CallStack",
    "name" : "const android::CallStack",
-   "referenced_type" : "type-686",
-   "self_type" : "type-688",
+   "referenced_type" : "type-198",
+   "self_type" : "type-200",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-383",
+   "self_type" : "type-3649",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2230",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-743",
-   "self_type" : "type-756",
+   "referenced_type" : "type-258",
+   "self_type" : "type-278",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -17387,18 +27458,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-55",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-376",
+   "self_type" : "type-3640",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2220",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-764",
-   "self_type" : "type-770",
+   "referenced_type" : "type-287",
+   "self_type" : "type-293",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17407,18 +27498,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
+   "referenced_type" : "type-165",
+   "self_type" : "type-167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase *>",
+   "name" : "const android::Vector<android::RefBase *>",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3441",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
+   "name" : "const android::Vector<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3437",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-684",
+   "referenced_type" : "type-194",
+   "self_type" : "type-196",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
+   "name" : "const android::Vector<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3433",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2225",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-378",
+   "self_type" : "type-3644",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2332",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<int>",
+   "name" : "const android::Vector<int>",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2325",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17427,18 +27588,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-675",
-   "self_type" : "type-679",
+   "referenced_type" : "type-187",
+   "self_type" : "type-191",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BHwBinder",
+   "name" : "const android::hardware::BHwBinder",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2173",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder",
+   "name" : "const android::hardware::BpHwBinder",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2184",
+   "size" : 144,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
+   "name" : "const android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2203",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2237",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2210",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2182",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput",
+   "name" : "const android::hardware::BufferedTextOutput",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2320",
+   "size" : 72,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
-   "referenced_type" : "type-30",
-   "self_type" : "type-485",
+   "referenced_type" : "type-663",
+   "self_type" : "type-1011",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17447,8 +27678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
-   "referenced_type" : "type-42",
-   "self_type" : "type-487",
+   "referenced_type" : "type-669",
+   "self_type" : "type-1013",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17457,8 +27688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
-   "referenced_type" : "type-792",
-   "self_type" : "type-809",
+   "referenced_type" : "type-326",
+   "self_type" : "type-343",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17467,8 +27698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-588",
+   "self_type" : "type-596",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17477,18 +27708,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
-   "referenced_type" : "type-321",
-   "self_type" : "type-816",
+   "referenced_type" : "type-347",
+   "self_type" : "type-355",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::HexDump",
+   "name" : "const android::hardware::HexDump",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2300",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1286",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17497,8 +27738,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2141",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2436",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17507,38 +27758,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-3780",
+   "self_type" : "type-3779",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1197",
-   "size" : 136,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
+   "name" : "const android::hardware::IBinder::DeathRecipient",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2232",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IInterface",
+   "name" : "const android::hardware::IInterface",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-3410",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IPCThreadState",
+   "name" : "const android::hardware::IPCThreadState",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-3451",
+   "size" : 528,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1537",
-   "size" : 136,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1084",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17547,8 +27818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17557,8 +27828,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1780",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1862",
+   "size" : 136,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
+   "size" : 136,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1984",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -17567,8 +27878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2037",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17577,8 +27888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -17587,8 +27898,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2166",
+   "size" : 136,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17597,8 +27918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2921",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17607,8 +27928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-3004",
+   "self_type" : "type-3003",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17617,8 +27938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17627,18 +27948,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
+   "size" : 136,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3175",
+   "self_type" : "type-3174",
    "size" : 136,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
+   "size" : 136,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-999",
+   "self_type" : "type-998",
+   "size" : 136,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState",
+   "name" : "const android::hardware::ProcessState",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-3663",
+   "size" : 328,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
+   "name" : "const android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3625",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-186",
+   "referenced_type" : "type-764",
+   "self_type" : "type-768",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17647,8 +28038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-172",
-   "self_type" : "type-178",
+   "referenced_type" : "type-757",
+   "self_type" : "type-762",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17657,8 +28048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-406",
+   "referenced_type" : "type-944",
+   "self_type" : "type-948",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17667,8 +28058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
-   "referenced_type" : "type-542",
-   "self_type" : "type-546",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1057",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17677,8 +28068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
-   "referenced_type" : "type-615",
-   "self_type" : "type-619",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1114",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17687,8 +28078,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1949",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17697,8 +28088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2019",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17707,8 +28098,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-410",
+   "referenced_type" : "type-250",
+   "self_type" : "type-460",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17717,8 +28108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "type-120",
+   "self_type" : "type-714",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17727,18 +28118,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-106",
-   "self_type" : "type-412",
+   "referenced_type" : "type-103",
+   "self_type" : "type-107",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::TypeCode",
+   "name" : "const android::hardware::TypeCode",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2295",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-484",
+   "referenced_type" : "type-368",
+   "self_type" : "type-1010",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17747,8 +28148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 176,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17757,8 +28158,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
+   "size" : 176,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::Waiter",
+   "name" : "const android::hardware::details::Waiter",
+   "referenced_type" : "type-755",
+   "self_type" : "type-754",
    "size" : 176,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17767,8 +28178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-513",
+   "referenced_type" : "type-968",
+   "self_type" : "type-1036",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17777,8 +28188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-572",
+   "self_type" : "type-607",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17787,8 +28198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-237",
+   "referenced_type" : "type-792",
+   "self_type" : "type-809",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17797,8 +28208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char>",
    "name" : "const android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-319",
+   "referenced_type" : "type-39",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17807,8 +28218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17817,8 +28228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int>",
    "name" : "const android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-210",
+   "referenced_type" : "type-474",
+   "self_type" : "type-492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17827,8 +28238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-105",
-   "self_type" : "type-455",
+   "referenced_type" : "type-112",
+   "self_type" : "type-115",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17837,8 +28248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32>",
    "name" : "const android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-971",
+   "self_type" : "type-2082",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17847,8 +28258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-882",
+   "referenced_type" : "type-83",
+   "self_type" : "type-432",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17857,8 +28268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-79",
+   "referenced_type" : "type-28",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17867,8 +28278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-203",
-   "self_type" : "type-222",
+   "referenced_type" : "type-60",
+   "self_type" : "type-62",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17877,8 +28288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-143",
+   "referenced_type" : "type-38",
+   "self_type" : "type-47",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17887,8 +28298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-967",
+   "self_type" : "type-2083",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17897,8 +28308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-476",
+   "referenced_type" : "type-571",
+   "self_type" : "type-574",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17907,8 +28318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-445",
+   "referenced_type" : "type-791",
+   "self_type" : "type-981",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17917,8 +28328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
-   "referenced_type" : "type-991",
-   "self_type" : "type-996",
+   "referenced_type" : "type-576",
+   "self_type" : "type-581",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17927,8 +28338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-921",
+   "referenced_type" : "type-473",
+   "self_type" : "type-477",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17937,8 +28348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-277",
+   "referenced_type" : "type-70",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17947,8 +28358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase",
    "name" : "const android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-828",
+   "referenced_type" : "type-369",
+   "self_type" : "type-373",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -17957,8 +28368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-759",
+   "referenced_type" : "type-281",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17967,8 +28378,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "referenced_type" : "type-302",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17977,8 +28388,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const",
    "name" : "const android::hidl::base::V1_0::IBase *const",
-   "referenced_type" : "type-795",
-   "self_type" : "type-811",
+   "referenced_type" : "type-329",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17987,8 +28398,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-265",
+   "referenced_type" : "type-829",
+   "self_type" : "type-833",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -17997,8 +28408,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-255",
+   "referenced_type" : "type-821",
+   "self_type" : "type-825",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -18007,8 +28418,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager",
    "name" : "const android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-943",
+   "referenced_type" : "type-505",
+   "self_type" : "type-504",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18017,8 +28428,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-444",
+   "referenced_type" : "type-503",
+   "self_type" : "type-980",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18027,8 +28438,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-942",
-   "self_type" : "type-947",
+   "referenced_type" : "type-502",
+   "self_type" : "type-509",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18037,8 +28448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-945",
+   "referenced_type" : "type-501",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18047,8 +28458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-938",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -18057,8 +28468,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-274",
+   "referenced_type" : "type-838",
+   "self_type" : "type-842",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -18067,8 +28478,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager",
    "name" : "const android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-952",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -18077,8 +28488,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-283",
+   "referenced_type" : "type-847",
+   "self_type" : "type-851",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -18087,8 +28498,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-130",
-   "self_type" : "type-286",
+   "referenced_type" : "type-727",
+   "self_type" : "type-854",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -18097,8 +28508,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback",
    "name" : "const android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-940",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -18107,28 +28518,138 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-954",
+   "referenced_type" : "type-518",
+   "self_type" : "type-517",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
-   "name" : "const android::sp<android::hardware::HidlMemory>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-383",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3620",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::Thread>",
+   "name" : "const android::sp<android::Thread>",
+   "referenced_type" : "type-453",
+   "self_type" : "type-3643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
+   "name" : "const android::sp<android::hardware::BHwBinder>",
+   "referenced_type" : "type-426",
+   "self_type" : "type-3450",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2308",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
+   "name" : "const android::sp<android::hardware::HidlMemory>",
+   "referenced_type" : "type-93",
+   "self_type" : "type-100",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2168",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-921",
+   "self_type" : "type-2217",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2334",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3389",
+   "self_type" : "type-3388",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3396",
+   "self_type" : "type-3395",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-384",
+   "self_type" : "type-440",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
+   "name" : "const android::sp<android::hardware::IInterface>",
+   "referenced_type" : "type-927",
+   "self_type" : "type-3407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18137,8 +28658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-719",
+   "self_type" : "type-718",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18147,8 +28668,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-899",
+   "referenced_type" : "type-445",
+   "self_type" : "type-450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18157,8 +28678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-979",
+   "referenced_type" : "type-556",
+   "self_type" : "type-559",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18167,8 +28688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter>",
    "name" : "const android::sp<android::hardware::details::Waiter>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-162",
+   "referenced_type" : "type-743",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18177,8 +28698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
+   "referenced_type" : "type-907",
+   "self_type" : "type-906",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18187,8 +28708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-81",
+   "self_type" : "type-80",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18197,8 +28718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-173",
-   "self_type" : "type-862",
+   "referenced_type" : "type-300",
+   "self_type" : "type-411",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18207,8 +28728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
-   "referenced_type" : "type-258",
-   "self_type" : "type-299",
+   "referenced_type" : "type-527",
+   "self_type" : "type-530",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18217,8 +28738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "type-543",
+   "self_type" : "type-546",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18227,8 +28748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-116",
+   "referenced_type" : "type-532",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18237,8 +28758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "type-549",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18247,8 +28768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
+   "referenced_type" : "type-538",
+   "self_type" : "type-541",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18257,8 +28778,36 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-873",
+   "referenced_type" : "type-331",
+   "self_type" : "type-423",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-900",
+   "self_type" : "type-2171",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1212",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-3565",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18266,24 +28815,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -18291,8 +28840,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient>",
    "name" : "const android::wp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-868",
+   "referenced_type" : "type-307",
+   "self_type" : "type-418",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18301,18 +28850,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-65",
+   "referenced_type" : "type-309",
+   "self_type" : "type-415",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const binder_buffer_object",
+   "name" : "const binder_buffer_object",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-905",
+   "referenced_type" : "type-29",
+   "self_type" : "type-456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18321,18 +28880,28 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-101",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const char *const",
+   "name" : "const char *const",
+   "referenced_type" : "type-41",
+   "self_type" : "type-2289",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-290",
+   "self_type" : "type-289",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18341,8 +28910,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18351,8 +28920,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1777",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18361,8 +28930,18 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2919",
+   "self_type" : "type-2918",
+   "size" : 280,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 280,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18377,12 +28956,22 @@
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const flat_binder_object",
+   "name" : "const flat_binder_object",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-724",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-238",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18391,8 +28980,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-441",
+   "referenced_type" : "type-14",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18400,240 +28989,360 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1062",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1370",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1541",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1895",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1955",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1836",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2027",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-202",
-   "self_type" : "type-201",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2449",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-238",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-273",
+   "self_type" : "type-272",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "type-2751",
+   "self_type" : "type-2750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2777",
+   "self_type" : "type-2776",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-752",
-   "self_type" : "type-751",
+   "referenced_type" : "type-2895",
+   "self_type" : "type-2894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "type-2982",
+   "self_type" : "type-2981",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-919",
-   "self_type" : "type-918",
+   "referenced_type" : "type-3037",
+   "self_type" : "type-3036",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-988",
-   "self_type" : "type-987",
+   "referenced_type" : "type-3095",
+   "self_type" : "type-3094",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3257",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3862",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-655",
+   "self_type" : "type-654",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-703",
+   "self_type" : "type-702",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-875",
+   "self_type" : "type-874",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18641,8 +29350,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-671",
+   "referenced_type" : "type-179",
+   "self_type" : "type-182",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18651,8 +29360,8 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-746",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-265",
+   "self_type" : "type-605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18661,8 +29370,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-13",
+   "self_type" : "type-12",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18671,8 +29380,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-971",
+   "referenced_type" : "type-151",
+   "self_type" : "type-548",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18681,8 +29390,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-928",
-   "self_type" : "type-927",
+   "referenced_type" : "type-484",
+   "self_type" : "type-483",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18691,8 +29400,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18701,8 +29410,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18711,8 +29420,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1202",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18721,8 +29430,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18731,8 +29440,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18741,8 +29450,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18751,8 +29460,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1547",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18761,8 +29470,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18771,8 +29480,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18781,8 +29490,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18791,8 +29500,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1847",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18801,8 +29510,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18811,8 +29520,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1962",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18821,8 +29530,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2034",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18831,8 +29540,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18841,8 +29550,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2126",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18851,8 +29560,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18861,8 +29570,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2078",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18871,8 +29580,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-224",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18881,8 +29590,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18891,8 +29600,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2688",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18901,8 +29610,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18911,8 +29620,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-567",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18921,8 +29630,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18931,8 +29640,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18941,8 +29650,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-926",
-   "self_type" : "type-925",
+   "referenced_type" : "type-2989",
+   "self_type" : "type-2988",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18951,8 +29660,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
+   "referenced_type" : "type-3045",
+   "self_type" : "type-3044",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3101",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3221",
+   "self_type" : "type-3220",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3261",
+   "self_type" : "type-3260",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3801",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3874",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-482",
+   "self_type" : "type-481",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-709",
+   "self_type" : "type-708",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-994",
+   "self_type" : "type-993",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18961,8 +29810,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18971,8 +29820,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1082",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18981,8 +29830,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18991,8 +29840,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19001,8 +29850,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1522",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19011,8 +29860,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19021,8 +29870,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19031,8 +29880,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1750",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19041,8 +29890,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1860",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19051,8 +29900,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1916",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19061,8 +29910,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19071,8 +29920,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-245",
-   "self_type" : "type-244",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19081,8 +29930,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19091,8 +29940,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19101,8 +29950,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19111,8 +29960,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-2783",
+   "self_type" : "type-2782",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19121,8 +29970,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-645",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19131,8 +29980,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-950",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3001",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-684",
+   "self_type" : "type-683",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-817",
+   "self_type" : "type-816",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-889",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19141,8 +30090,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19151,8 +30100,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1080",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19161,8 +30110,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19171,8 +30120,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19181,8 +30130,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1520",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19191,8 +30140,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19211,8 +30160,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1806",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19221,8 +30170,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1858",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19231,8 +30180,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1914",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19241,8 +30190,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2024",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19251,8 +30200,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-243",
-   "self_type" : "type-242",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2052",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19261,8 +30210,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-333",
-   "self_type" : "type-332",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19271,8 +30220,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2477",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19281,8 +30230,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19291,8 +30240,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19301,8 +30250,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19311,8 +30260,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-949",
-   "self_type" : "type-948",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3000",
+   "self_type" : "type-2999",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3056",
+   "self_type" : "type-3055",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3118",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-682",
+   "self_type" : "type-681",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-815",
+   "self_type" : "type-814",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19321,8 +30370,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1071",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19331,48 +30410,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1142",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19381,8 +30420,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19391,38 +30430,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1496",
+   "self_type" : "type-1495",
    "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1545",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1616",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19431,8 +30450,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1682",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1628",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19441,8 +30470,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1849",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19451,8 +30480,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19461,8 +30490,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2088",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -19471,8 +30520,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1938",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19481,8 +30530,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2462",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19491,8 +30540,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2540",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19501,8 +30550,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2636",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19511,8 +30560,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2723",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -19521,6 +30580,106 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2991",
+   "self_type" : "type-2990",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3046",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3106",
+   "self_type" : "type-3105",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3222",
+   "size" : 24,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3805",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 24,
@@ -19531,58 +30690,68 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-600",
+   "self_type" : "type-599",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-752",
+   "self_type" : "type-751",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
    "alignment" : 16,
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19591,8 +30760,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19601,8 +30770,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-3879",
+   "self_type" : "type-3878",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19611,8 +30790,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19621,8 +30800,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19631,8 +30810,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-814",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
+   "name" : "const std::function<sp<IBinder> (void *)>",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19641,8 +30830,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -19651,8 +30840,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 48,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -19661,128 +30850,248 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3453",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 16,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
+   "size" : 48,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1764",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2032",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2905",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2986",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3100",
+   "self_type" : "type-3099",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3169",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-975",
+   "self_type" : "type-974",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1065",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
    "referenced_type" : "type-1759",
    "self_type" : "type-1758",
-   "size" : 48,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
-   "size" : 48,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-734",
-   "self_type" : "type-733",
-   "size" : 48,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
-   "size" : 48,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1527",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1676",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-1732",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1840",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 16,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-630",
-   "self_type" : "type-629",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19791,8 +31100,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19801,8 +31110,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19811,8 +31120,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19821,8 +31130,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19831,8 +31140,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19841,8 +31150,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2899",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19851,8 +31160,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2984",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19861,8 +31170,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-3040",
+   "self_type" : "type-3039",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19871,18 +31180,58 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
+   "referenced_type" : "type-3098",
+   "self_type" : "type-3097",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3212",
+   "self_type" : "type-3211",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19891,8 +31240,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> >",
+   "name" : "const std::vector<int, std::allocator<int> >",
+   "referenced_type" : "type-788",
+   "self_type" : "type-787",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19901,8 +31260,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19911,8 +31270,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19921,8 +31280,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19931,8 +31290,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19941,8 +31300,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19951,8 +31310,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19961,8 +31320,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19971,8 +31330,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19981,8 +31340,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1551",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19991,8 +31350,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20001,8 +31360,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-164",
+   "self_type" : "type-163",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20011,8 +31370,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1663",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20021,8 +31380,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20031,8 +31390,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20041,8 +31400,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1820",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20051,8 +31410,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-165",
-   "self_type" : "type-164",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20061,48 +31420,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1761",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1885",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20121,8 +31440,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2033",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20131,8 +31450,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20141,8 +31460,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20151,8 +31470,178 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-291",
-   "self_type" : "type-290",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2486",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2666",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2692",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2804",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3010",
+   "self_type" : "type-3009",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3027",
+   "self_type" : "type-3026",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3131",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3246",
+   "self_type" : "type-3245",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20171,8 +31660,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "type-3721",
+   "self_type" : "type-3720",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20181,8 +31670,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3829",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20191,8 +31680,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20201,8 +31690,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20211,8 +31700,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-522",
+   "self_type" : "type-521",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20221,8 +31710,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-611",
+   "self_type" : "type-610",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20231,8 +31720,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20241,8 +31730,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-958",
-   "self_type" : "type-957",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20251,8 +31740,48 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-892",
+   "self_type" : "type-891",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20261,18 +31790,28 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-454",
+   "referenced_type" : "type-146",
+   "self_type" : "type-523",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned char *const",
+   "name" : "const unsigned char *const",
+   "referenced_type" : "type-989",
+   "self_type" : "type-3541",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-677",
+   "referenced_type" : "type-44",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20281,18 +31820,38 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-678",
+   "referenced_type" : "type-16",
+   "self_type" : "type-190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned long *const",
+   "name" : "const unsigned long *const",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const unsigned long long",
+   "name" : "const unsigned long long",
+   "referenced_type" : "type-389",
+   "self_type" : "type-2165",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-982",
+   "referenced_type" : "type-71",
+   "self_type" : "type-562",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20300,38 +31859,121 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-295",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const void *const",
+   "name" : "const void *const",
+   "referenced_type" : "type-78",
+   "self_type" : "type-2198",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "void *const",
+   "name" : "void *const",
+   "referenced_type" : "type-188",
+   "self_type" : "type-3482",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 1,
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-861",
+   "referenced_type" : "type-29",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-14",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
   }
  ],
  "record_types" :
  [
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 64,
+     "referenced_type" : "type-2314"
+    },
+    {
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 128,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mENK7RenamerclEm"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mEN7RenamerD0Ev"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mFrameLines",
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-194"
     }
    ],
    "linker_set_key" : "android::CallStack",
    "name" : "android::CallStack",
    "record_kind" : "class",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStackE"
@@ -20340,27 +31982,37 @@
    "alignment" : 1,
    "linker_set_key" : "android::CallStack::StackDeleter",
    "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-690",
-   "self_type" : "type-690",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::CompileTimeAssert<true>",
+   "name" : "android::CompileTimeAssert<true>",
+   "referenced_type" : "type-3619",
+   "self_type" : "type-3619",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Debug.h",
+   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-848"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -20372,37 +32024,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-376"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-838",
-   "self_type" : "type-838",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-764", "type-72" ],
+   "template_args" : [ "type-287", "type-384" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2153"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2152",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-78", "type-2155" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-257"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-743" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -20412,17 +32084,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -20432,14 +32104,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-842"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -20451,14 +32123,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -20468,7 +32140,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-256"
     }
    ],
    "fields" :
@@ -20477,20 +32149,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -20502,14 +32174,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-852"
+     "referenced_type" : "type-401"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -20521,14 +32193,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-856"
+     "referenced_type" : "type-405"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -20540,14 +32212,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-856"
+     "referenced_type" : "type-405"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-859",
-   "self_type" : "type-859",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -20560,14 +32232,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -20607,8 +32279,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -20618,8 +32290,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -20629,8 +32301,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-7",
+   "self_type" : "type-7",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -20656,14 +32328,14 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-1024",
+   "self_type" : "type-1024",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -20674,17 +32346,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-832" ],
+   "template_args" : [ "type-377" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -20731,14 +32403,72 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-675"
+     "access" : "private",
+     "referenced_type" : "type-193"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2154" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_m"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_m"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_m"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_m"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -20796,14 +32526,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-288"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-764",
-   "self_type" : "type-764",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -20815,14 +32545,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -20833,7 +32563,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -20842,62 +32572,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-905"
+     "referenced_type" : "type-456"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-390"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-453"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-904",
-   "self_type" : "type-904",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -20987,17 +32717,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -21042,17 +32772,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-36" ],
+   "template_args" : [ "type-308" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -21097,17 +32827,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -21152,17 +32882,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-798" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -21207,17 +32937,72 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-378",
+   "self_type" : "type-378",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-834" ],
+   "template_args" : [ "type-379" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -21258,38 +33043,148 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<int>",
+   "name" : "android::Vector<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6VectorIiEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-189"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-678"
+     "referenced_type" : "type-190"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -21341,14 +33236,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-124"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -21372,29 +33267,640 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3691",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287", "type-384" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2155" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2139"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 96,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 128,
+     "referenced_type" : "type-2145"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 192,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2139"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mHandle",
+     "field_offset" : 64,
+     "referenced_type" : "type-569"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlive",
+     "field_offset" : 416,
+     "referenced_type" : "type-2148"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObitsSent",
+     "field_offset" : 448,
+     "referenced_type" : "type-2148"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObituaries",
+     "field_offset" : 512,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 576,
+     "referenced_type" : "type-2151"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mConstantData",
+     "field_offset" : 896,
+     "referenced_type" : "type-2158"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDescriptorCache",
+     "field_offset" : 960,
+     "referenced_type" : "type-287"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder",
+   "name" : "android::hardware::BpHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
+   "size" : 144,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 128,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -128,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "recipient",
+     "referenced_type" : "type-900"
+    },
+    {
+     "field_name" : "cookie",
+     "field_offset" : 128,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 192,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
+   "name" : "android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "referenced_type" : "type-2152"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
+   "name" : "android::hardware::BpHwBinder::ObjectManager",
+   "record_kind" : "class",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "object",
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "cleanupCookie",
+     "field_offset" : 64,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "func",
+     "field_offset" : 128,
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 64,
+     "referenced_type" : "type-2178"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 128,
+     "referenced_type" : "type-308"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 192,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2285"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mFlags",
+     "field_offset" : 64,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSeq",
+     "field_offset" : 96,
+     "referenced_type" : "type-569"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIndex",
+     "field_offset" : 128,
+     "referenced_type" : "type-569"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 160,
+     "referenced_type" : "type-390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mGlobalState",
+     "field_offset" : 512,
+     "referenced_type" : "type-2282"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BufferedTextOutput",
+   "name" : "android::hardware::BufferedTextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
+   "size" : 72,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecm"
+    }
+   ]
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-664"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-32"
+     "referenced_type" : "type-665"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-663",
+   "self_type" : "type-663",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-38" ],
+   "template_args" : [ "type-309", "type-368" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -21404,23 +33910,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-670"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-671"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-669",
+   "self_type" : "type-669",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-45" ],
+   "template_args" : [ "type-309", "type-29" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -21430,23 +33936,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-327"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-328"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-795", "type-797" ],
+   "template_args" : [ "type-329", "type-331" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -21456,23 +33962,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-589"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-329"
+     "referenced_type" : "type-590"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-330", "type-331" ],
+   "template_args" : [ "type-591", "type-592" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -21482,23 +33988,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-322"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-323"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-324", "type-325" ],
+   "template_args" : [ "type-350", "type-351" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -21507,50 +34013,99 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-78"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 64,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBytesPerLine",
+     "field_offset" : 128,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSingleLineCutoff",
+     "field_offset" : 192,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlignment",
+     "field_offset" : 256,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCArrayStyle",
+     "field_offset" : 320,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "linker_set_key" : "android::hardware::HexDump",
+   "name" : "android::hardware::HexDump",
+   "record_kind" : "class",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-60"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-349",
-   "self_type" : "type-349",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -21627,19 +34182,439 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2139",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-450"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 384,
+     "referenced_type" : "type-381"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 704,
+     "referenced_type" : "type-382"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-381"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 1344,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 2432,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 3520,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 3552,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 3584,
+     "referenced_type" : "type-41"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 3648,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 3680,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 3712,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 3776,
+     "referenced_type" : "type-426"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 3840,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 3848,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 3904,
+     "referenced_type" : "type-2247"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 4096,
+     "referenced_type" : "type-2248"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 4160,
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
+   "size" : 528,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-929",
-   "self_type" : "type-929",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -21651,42 +34626,409 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-275"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mQuantum",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
    "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 64,
+     "referenced_type" : "type-2160"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 256,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 320,
+     "referenced_type" : "type-231"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 384,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 448,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 512,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 576,
+     "referenced_type" : "type-2161"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 640,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 704,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 768,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 832,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 896,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 904,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 912,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 960,
+     "referenced_type" : "type-2162"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 1024,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2159",
+   "size" : 136,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-389"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-389"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 128,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 192,
+     "referenced_type" : "type-2251"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 512,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 896,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 960,
+     "referenced_type" : "type-16"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-265"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 1088,
+     "referenced_type" : "type-390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 1408,
+     "referenced_type" : "type-378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 1728,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 1792,
+     "referenced_type" : "type-2243"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 1856,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 1920,
+     "referenced_type" : "type-383"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 2240,
+     "referenced_type" : "type-165"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 2304,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 2312,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 2336,
+     "referenced_type" : "type-2148"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 2368,
+     "referenced_type" : "type-190"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2432,
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
+   "size" : 328,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 312,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -312,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -312,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2140"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21695,17 +35037,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-501"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "record_kind" : "class",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-764",
+   "self_type" : "type-764",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-501" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -21713,7 +35055,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21722,17 +35064,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-173" ],
+   "template_args" : [ "type-300" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -21740,7 +35082,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21749,17 +35091,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-944",
+   "self_type" : "type-944",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-258" ],
+   "template_args" : [ "type-527" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -21767,7 +35109,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21776,17 +35118,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-543"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-146" ],
+   "template_args" : [ "type-543" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -21794,7 +35136,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21803,17 +35145,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-532"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1110",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-111" ],
+   "template_args" : [ "type-532" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -21821,7 +35163,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21830,17 +35172,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-549" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -21848,7 +35190,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21857,17 +35199,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-538"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2015",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-127" ],
+   "template_args" : [ "type-538" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -21875,7 +35217,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21884,17 +35226,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -21902,17 +35244,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -21922,48 +35264,131 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput",
+   "name" : "android::hardware::TextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTO",
+     "referenced_type" : "type-2287"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TextOutput::Bundle",
+   "name" : "android::hardware::TextOutput::Bundle",
+   "record_kind" : "class",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCode",
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TypeCode",
+   "name" : "android::hardware::TypeCode",
+   "record_kind" : "class",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-30" ],
+   "template_args" : [ "type-663" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
   },
   {
@@ -21973,17 +35398,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-669" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
   },
   {
@@ -21993,17 +35418,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-326" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
   },
   {
@@ -22013,17 +35438,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-602",
+   "self_type" : "type-602",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-327" ],
+   "template_args" : [ "type-588" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
   },
   {
@@ -22033,17 +35458,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-321" ],
+   "template_args" : [ "type-347" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
   },
   {
@@ -22054,31 +35479,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 64,
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-129"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 256,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 320,
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-130"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 512,
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-131"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 88,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -22107,18 +35532,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -22130,14 +35555,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -22146,8 +35571,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -22156,8 +35581,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -22166,8 +35591,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -22179,19 +35604,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-261"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -22203,19 +35628,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-794"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-793",
+   "self_type" : "type-793",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -22226,16 +35651,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-459"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-262" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22244,16 +35669,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-969"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-971" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -22262,16 +35687,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-573"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-572",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -22280,16 +35705,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-793"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-792",
+   "self_type" : "type-792",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-503" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -22298,16 +35723,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-985"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -22317,19 +35742,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-186"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -22340,16 +35765,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-40"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -22359,19 +35784,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -22382,16 +35807,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-10"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-9",
+   "self_type" : "type-9",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -22401,19 +35826,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -22425,19 +35850,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-970"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLm32EJEEEEUt_E"
@@ -22449,19 +35874,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-573",
+   "self_type" : "type-573",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -22472,16 +35897,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-475"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -22491,19 +35916,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-476"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-475",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -22514,16 +35939,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-271"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-13" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -22533,19 +35958,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-271",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -22567,20 +35992,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-103"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -22589,11 +36014,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 32>",
    "name" : "android::hardware::details::std_array<unsigned char, 32>",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-987",
+   "self_type" : "type-987",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLm32EJEEE"
   },
   {
@@ -22603,16 +36028,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-972"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-971",
+   "self_type" : "type-971",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLm32EJEEE"
   },
   {
@@ -22620,7 +36045,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-310"
     }
    ],
    "fields" :
@@ -22629,25 +36054,25 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 64,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-307"
     },
     {
      "access" : "private",
      "field_name" : "mCookie",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 256,
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "size" : 64,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -22727,13 +36152,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -22815,19 +36240,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-9"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -22839,25 +36264,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -22869,25 +36294,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -22899,28 +36324,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-262" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22930,28 +36355,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-968"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-971" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEE"
   },
   {
@@ -22961,28 +36386,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-425"
+     "referenced_type" : "type-572"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-571",
+   "self_type" : "type-571",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -22992,28 +36417,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-792"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-791",
+   "self_type" : "type-791",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-503" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -23023,28 +36448,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-984"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-983",
+   "self_type" : "type-983",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -23052,7 +36477,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-992"
+     "referenced_type" : "type-577"
     }
    ],
    "fields" :
@@ -23060,14 +36485,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "record_kind" : "class",
-   "referenced_type" : "type-991",
-   "self_type" : "type-991",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -23079,28 +36504,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-474"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -23110,19 +36535,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -23132,10 +36557,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23144,13 +36569,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 960,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 144,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BnHwBaseE",
@@ -23272,10 +36697,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-372"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23284,19 +36709,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-370"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-371"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE",
@@ -23479,10 +36904,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23491,19 +36916,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-862"
+     "referenced_type" : "type-411"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2061",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE",
@@ -23629,23 +37054,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -23656,13 +37081,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-302",
+   "self_type" : "type-302",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -23771,7 +37196,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23780,13 +37205,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-827",
+   "self_type" : "type-827",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE",
@@ -23908,7 +37333,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23917,13 +37342,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-543"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE",
@@ -24045,10 +37470,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-832"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24057,19 +37482,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-830"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-831"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-829",
+   "self_type" : "type-829",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE",
@@ -24276,10 +37701,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-824"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24288,19 +37713,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-822"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-823"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE",
@@ -24486,10 +37911,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-505"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24498,19 +37923,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-530"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-916",
+   "self_type" : "type-916",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE",
@@ -24659,10 +38084,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-496"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24671,19 +38096,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-546"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE",
@@ -24811,13 +38236,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE",
@@ -24959,33 +38384,33 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-473"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-503",
+   "self_type" : "type-503",
    "size" : 64,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
@@ -24995,13 +38420,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -25114,7 +38539,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25123,13 +38548,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-532"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-836",
+   "self_type" : "type-836",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE",
@@ -25251,10 +38676,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-841"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25263,19 +38688,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-839"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-840"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE",
@@ -25485,10 +38910,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25497,19 +38922,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-535"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE",
@@ -25661,13 +39086,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE",
@@ -25812,7 +39237,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25821,13 +39246,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE",
@@ -25949,7 +39374,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25958,13 +39383,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 1024,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-538"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 152,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE",
@@ -26086,10 +39511,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-850"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26098,19 +39523,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-848"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-281"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE",
@@ -26296,10 +39721,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-730"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26308,19 +39733,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 1088,
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-728"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 1408,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-729"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-727",
+   "self_type" : "type-727",
    "size" : 216,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE",
@@ -26545,10 +39970,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-499"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26557,19 +39982,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-554"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE",
@@ -26697,10 +40122,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-518"
     },
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26709,19 +40134,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 768,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-541"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 136,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE",
@@ -26888,13 +40313,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE",
@@ -27007,13 +40432,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-515"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE",
@@ -27178,19 +40603,65 @@
    "fields" :
    [
     {
+     "field_name" : "key",
+     "referenced_type" : "type-287"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 64,
+     "referenced_type" : "type-384"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3621",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287", "type-384" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "key",
+     "referenced_type" : "type-78"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 64,
+     "referenced_type" : "type-2155"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2155" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-903"
+     "referenced_type" : "type-454"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-902",
-   "self_type" : "type-902",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-904" ],
+   "template_args" : [ "type-455" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -27200,17 +40671,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-876",
-   "self_type" : "type-876",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-877" ],
+   "template_args" : [ "type-427" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -27220,17 +40691,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-2282"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2284" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::HidlMemory>",
    "name" : "android::sp<android::hardware::HidlMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-349" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10HidlMemoryEEE"
   },
   {
@@ -27240,17 +40731,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-901"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-379" ],
+   "template_args" : [ "type-922" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -27260,37 +40751,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-73"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-385"
     }
    ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
    "referenced_type" : "type-384",
    "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-387" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-928"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IInterface>",
+   "name" : "android::sp<android::hardware::IInterface>",
+   "record_kind" : "class",
+   "referenced_type" : "type-927",
+   "self_type" : "type-927",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-930" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -27300,17 +40791,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-121" ],
+   "template_args" : [ "type-722" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -27320,17 +40811,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-895"
+     "referenced_type" : "type-446"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-894",
-   "self_type" : "type-894",
+   "referenced_type" : "type-445",
+   "self_type" : "type-445",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-897" ],
+   "template_args" : [ "type-448" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -27340,17 +40831,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-552"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-976",
-   "self_type" : "type-976",
+   "referenced_type" : "type-556",
+   "self_type" : "type-556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-977" ],
+   "template_args" : [ "type-557" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -27360,17 +40851,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-738"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
    "name" : "android::sp<android::hardware::details::Waiter>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-744" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
   },
   {
@@ -27380,17 +40871,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-907",
+   "self_type" : "type-907",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-306" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -27400,17 +40891,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-82"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -27420,17 +40911,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-300",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -27440,17 +40931,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-528"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-505" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -27460,17 +40951,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-544"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-148" ],
+   "template_args" : [ "type-496" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -27480,17 +40971,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-533"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-515" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
   },
   {
@@ -27500,17 +40991,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-550"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-549",
+   "self_type" : "type-549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -27520,47 +41011,322 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-539"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-127",
-   "self_type" : "type-127",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-518" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
+   "name" : "android::trait_pointer<android::RefBase *>",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3561",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3560",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::String16>",
+   "name" : "android::trait_pointer<android::String16>",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3684",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3559",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3682",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3683",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3685",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<const void *>",
+   "name" : "android::trait_pointer<const void *>",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<int>",
+   "name" : "android::trait_pointer<int>",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3710",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
+   "name" : "android::trait_trivial_copy<android::RefBase *>",
+   "referenced_type" : "type-3554",
+   "self_type" : "type-3554",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3553",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
+   "name" : "android::trait_trivial_copy<android::String16>",
+   "referenced_type" : "type-3676",
+   "self_type" : "type-3676",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3550",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3675",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3678",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3677",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<const void *>",
+   "name" : "android::trait_trivial_copy<const void *>",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27570,151 +41336,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-724" ],
+   "template_args" : [ "type-238" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-225",
+   "self_type" : "type-225",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-276",
+   "self_type" : "type-276",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-265" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-389" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase *>",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3496",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3483",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
+   "name" : "android::trait_trivial_ctor<android::String16>",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3667",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3471",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3665",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3666",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3670",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
+   "name" : "android::trait_trivial_ctor<const void *>",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27724,151 +41622,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-724" ],
+   "template_args" : [ "type-238" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-265" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-245",
+   "self_type" : "type-245",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-389" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-514",
-   "self_type" : "type-514",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase *>",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3549",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3539",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
+   "name" : "android::trait_trivial_dtor<android::String16>",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3672",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3527",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3671",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3674",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3673",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
+   "name" : "android::trait_trivial_dtor<const void *>",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-911",
-   "self_type" : "type-911",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27878,173 +41908,294 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-724" ],
+   "template_args" : [ "type-238" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-265" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-402",
+   "self_type" : "type-402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-389" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
+   "name" : "android::trait_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3558",
+   "self_type" : "type-3558",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3557",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-764" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3556",
+   "self_type" : "type-3556",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3679",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3681",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3680",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<const void *>",
+   "name" : "android::trait_trivial_move<const void *>",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-917",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28054,147 +42205,443 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-459",
+   "self_type" : "type-459",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-724" ],
+   "template_args" : [ "type-238" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-830",
-   "self_type" : "type-830",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-746" ],
+   "template_args" : [ "type-265" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-154",
+   "self_type" : "type-154",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-871",
+   "referenced_type" : "type-421",
+   "self_type" : "type-421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-840" ],
+   "template_args" : [ "type-389" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase *>",
+   "name" : "android::traits<android::RefBase *>",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3564",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
+   "name" : "android::traits<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3563",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::String16>",
+   "name" : "android::traits<android::String16>",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3688",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-287" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
+   "name" : "android::traits<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3562",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3686",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3687",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3689",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-384" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<const void *>",
+   "name" : "android::traits<const void *>",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android6traitsIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<int>",
+   "name" : "android::traits<int>",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3711",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6traitsIiEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3427"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
+   "name" : "android::use_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3426",
+   "self_type" : "type-3426",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3425"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3424",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3423"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3422",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2143" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2208"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3629"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3628",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3631"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3630",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3621" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2206"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2344"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3693"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<int>",
+   "name" : "android::use_trivial_move<int>",
+   "referenced_type" : "type-3692",
+   "self_type" : "type-3692",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-800" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28204,23 +42651,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-901"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-900",
+   "self_type" : "type-900",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-353" ],
+   "template_args" : [ "type-904" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -28230,23 +42677,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-2140"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::hardware::IBinder>",
+   "name" : "android::wp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-2139" ],
+   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-82"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -28256,23 +42729,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-309",
+   "self_type" : "type-309",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28281,18 +42754,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -28303,23 +42776,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-228"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -28330,23 +42803,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-718"
+     "referenced_type" : "type-232"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-234"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 16,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -28357,48 +42830,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-231"
     },
     {
      "field_name" : "component",
      "field_offset" : 64,
-     "referenced_type" : "type-715"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -28409,38 +42882,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -28451,18 +42924,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -28473,43 +42946,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -28519,13 +42992,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -28536,35 +43009,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-181"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-177"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-665"
+     "referenced_type" : "type-176"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-663"
+     "referenced_type" : "type-174"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "record_kind" : "union",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
@@ -28575,18 +43048,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -28597,43 +43070,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -28644,48 +43117,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -28696,48 +43169,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -28748,53 +43221,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -28805,31 +43278,58 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lock",
+     "referenced_type" : "type-2323"
+    },
+    {
+     "field_name" : "has_tls",
+     "field_offset" : 320,
+     "referenced_type" : "type-14"
+    },
+    {
+     "field_name" : "tls",
+     "field_offset" : 352,
+     "referenced_type" : "type-14"
+    }
+   ],
+   "linker_set_key" : "thread_store_t",
+   "name" : "thread_store_t",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
+   "size" : 48,
+   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
+   "unique_id" : "thread_store_t"
   }
  ],
  "rvalue_reference_types" :
@@ -28838,8 +43338,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
-   "referenced_type" : "type-180",
-   "self_type" : "type-184",
+   "referenced_type" : "type-764",
+   "self_type" : "type-766",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28847,8 +43347,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
-   "referenced_type" : "type-172",
-   "self_type" : "type-175",
+   "referenced_type" : "type-757",
+   "self_type" : "type-759",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28856,8 +43356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
-   "referenced_type" : "type-402",
-   "self_type" : "type-404",
+   "referenced_type" : "type-944",
+   "self_type" : "type-946",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28865,8 +43365,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1055",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28874,8 +43374,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
-   "referenced_type" : "type-615",
-   "self_type" : "type-617",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1112",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28883,8 +43383,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1947",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28892,8 +43392,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2017",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28901,8 +43401,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-411",
-   "self_type" : "type-738",
+   "referenced_type" : "type-250",
+   "self_type" : "type-253",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28910,8 +43410,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-104",
-   "self_type" : "type-494",
+   "referenced_type" : "type-120",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28919,8 +43419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-106",
-   "self_type" : "type-414",
+   "referenced_type" : "type-103",
+   "self_type" : "type-109",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28928,8 +43428,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-38",
-   "self_type" : "type-41",
+   "referenced_type" : "type-368",
+   "self_type" : "type-668",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -28937,8 +43437,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &&",
    "name" : "android::hardware::details::hidl_pointer<const char> &&",
-   "referenced_type" : "type-98",
-   "self_type" : "type-318",
+   "referenced_type" : "type-39",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -28946,8 +43446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-105",
-   "self_type" : "type-452",
+   "referenced_type" : "type-112",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28955,8 +43455,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-77",
-   "self_type" : "type-84",
+   "referenced_type" : "type-28",
+   "self_type" : "type-33",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28964,8 +43464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-203",
-   "self_type" : "type-227",
+   "referenced_type" : "type-60",
+   "self_type" : "type-65",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28973,8 +43473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_string &&",
    "name" : "android::hardware::hidl_string &&",
-   "referenced_type" : "type-97",
-   "self_type" : "type-188",
+   "referenced_type" : "type-38",
+   "self_type" : "type-55",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28982,8 +43482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-206",
-   "self_type" : "type-207",
+   "referenced_type" : "type-473",
+   "self_type" : "type-784",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28991,8 +43491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-876",
-   "self_type" : "type-888",
+   "referenced_type" : "type-426",
+   "self_type" : "type-438",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29000,8 +43500,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> &&",
    "name" : "android::sp<android::hardware::HidlMemory> &&",
-   "referenced_type" : "type-347",
-   "self_type" : "type-377",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-921",
+   "self_type" : "type-2234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29009,8 +43518,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-72",
-   "self_type" : "type-887",
+   "referenced_type" : "type-384",
+   "self_type" : "type-437",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29018,8 +43527,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
-   "referenced_type" : "type-356",
-   "self_type" : "type-398",
+   "referenced_type" : "type-907",
+   "self_type" : "type-941",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29027,8 +43536,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-304",
-   "self_type" : "type-880",
+   "referenced_type" : "type-81",
+   "self_type" : "type-430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29036,8 +43545,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-173",
-   "self_type" : "type-959",
+   "referenced_type" : "type-300",
+   "self_type" : "type-524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29045,8 +43554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
-   "referenced_type" : "type-258",
-   "self_type" : "type-391",
+   "referenced_type" : "type-527",
+   "self_type" : "type-934",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29054,8 +43563,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
-   "referenced_type" : "type-146",
-   "self_type" : "type-396",
+   "referenced_type" : "type-543",
+   "self_type" : "type-939",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29063,8 +43572,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-532",
+   "self_type" : "type-716",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29072,8 +43581,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1713",
+   "referenced_type" : "type-549",
+   "self_type" : "type-1942",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29081,8 +43590,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
-   "referenced_type" : "type-127",
-   "self_type" : "type-300",
+   "referenced_type" : "type-538",
+   "self_type" : "type-867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29090,8 +43599,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-797",
-   "self_type" : "type-808",
+   "referenced_type" : "type-331",
+   "self_type" : "type-342",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29099,8 +43608,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-33",
-   "self_type" : "type-40",
+   "referenced_type" : "type-309",
+   "self_type" : "type-667",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29108,8 +43617,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-795",
-   "self_type" : "type-807",
+   "referenced_type" : "type-329",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29117,8 +43626,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29126,8 +43635,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29135,8 +43644,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29144,8 +43653,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29153,8 +43662,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29162,8 +43671,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1909",
+   "self_type" : "type-1908",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29171,8 +43680,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29180,8 +43689,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29189,8 +43698,62 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2994",
+   "self_type" : "type-2993",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3050",
+   "self_type" : "type-3049",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3110",
+   "self_type" : "type-3109",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29198,8 +43761,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29207,8 +43770,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29216,8 +43779,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29225,8 +43788,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1746",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1802",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29234,8 +43797,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29243,8 +43806,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29252,8 +43815,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29261,8 +43824,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29270,8 +43833,62 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2943",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2998",
+   "self_type" : "type-2997",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3053",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3115",
+   "self_type" : "type-3114",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3187",
+   "self_type" : "type-3186",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29279,8 +43896,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29288,8 +43905,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1076",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29297,8 +43914,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29306,8 +43923,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29315,8 +43932,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29324,8 +43941,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1911",
+   "self_type" : "type-1910",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29333,8 +43950,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29342,8 +43959,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2047",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29351,8 +43968,62 @@
    "alignment" : 8,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2996",
+   "self_type" : "type-2995",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3111",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3185",
+   "self_type" : "type-3184",
+   "size" : 8,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/29/64/x86_64/source-based/libhwbinder.so.lsdump b/29/64/x86_64/source-based/libhwbinder.so.lsdump
deleted file mode 100644
index a97482e..0000000
--- a/29/64/x86_64/source-based/libhwbinder.so.lsdump
+++ /dev/null
@@ -1,16819 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-165",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [10]",
-   "name" : "char [10]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-728",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [11]",
-   "name" : "char [11]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-750",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [12]",
-   "name" : "char [12]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-724",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [13]",
-   "name" : "char [13]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-721",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [14]",
-   "name" : "char [14]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-769",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [15]",
-   "name" : "char [15]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-127",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-754",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [17]",
-   "name" : "char [17]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-772",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [18]",
-   "name" : "char [18]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-757",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [19]",
-   "name" : "char [19]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-788",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [20]",
-   "name" : "char [20]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-766",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [22]",
-   "name" : "char [22]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-791",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [25]",
-   "name" : "char [25]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-781",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [28]",
-   "name" : "char [28]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-803",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [29]",
-   "name" : "char [29]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-778",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [2]",
-   "name" : "char [2]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-732",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [31]",
-   "name" : "char [31]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-763",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-794",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [35]",
-   "name" : "char [35]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-785",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [37]",
-   "name" : "char [37]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-775",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [3]",
-   "name" : "char [3]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-744",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4]",
-   "name" : "char [4]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-124",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [5]",
-   "name" : "char [5]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-131",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [6]",
-   "name" : "char [6]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-735",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [7]",
-   "name" : "char [7]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-760",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [8]",
-   "name" : "char [8]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-747",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [9]",
-   "name" : "char [9]",
-   "referenced_type" : "type-120",
-   "self_type" : "type-738",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-102",
-   "self_type" : "type-236",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-9",
-   "self_type" : "type-90",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-11",
-   "self_type" : "type-174",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-4",
-   "self_type" : "type-224",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
-   "size" : 1
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char16_t",
-   "name" : "char16_t",
-   "referenced_type" : "type-292",
-   "self_type" : "type-292",
-   "size" : 2
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEm"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEmPm"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEmb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC1Em"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC2Em"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhmPKymPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEl"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt64El"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11finishWriteEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11setDataSizeEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvmPm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint64Em"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12restartWriteEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeInplaceEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writePointerEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13continueWriteEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPmmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhmPKymPFvPS1_S3_mS5_mPvES7_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvmPmmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPmmmmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlemm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPmmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel5writeEPKvm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel6removeEmm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel7setDataEPKhm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8growDataEm"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9initStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC1EPKvmm"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC2EPKvmm"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64EPm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readInplaceEm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEPm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPmPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEmPmmmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEmPmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectmjmm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEmm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEmm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPmmmPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEmmPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEmPmmmPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebmm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEmmPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4dataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4readEPvm"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64EPl"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
-  },
-  {
-   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_m"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "getHWBinderKernelReferences"
-  },
-  {
-   "name" : "printHexData"
-  },
-  {
-   "name" : "printTypeCode"
-  },
-  {
-   "name" : "stringForIndent"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "name" : "_ZN7android8hardware12gTextBuffersE"
-  },
-  {
-   "name" : "_ZN7android8hardware13gProcessMutexE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aerrE"
-  },
-  {
-   "name" : "_ZN7android8hardware4alogE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aoutE"
-  },
-  {
-   "name" : "_ZN7android8hardware8gProcessE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10IInterfaceE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware12ProcessStateE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIiEE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10IInterfaceE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware10PoolThreadE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10TextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware12FdTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware12ProcessStateE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware13LogTextOutputE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String16::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String16::StaticLinkage",
-   "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
-   "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-385",
-   "self_type" : "type-385",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-9",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-587"
-    }
-   ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-587",
-   "self_type" : "type-591",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-380"
-    },
-    {
-     "referenced_type" : "type-153"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "referenced_type" : "type-379",
-   "return_type" : "type-14",
-   "self_type" : "type-379",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "referenced_type" : "type-243",
-   "return_type" : "type-9",
-   "self_type" : "type-243",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-599"
-    }
-   ],
-   "referenced_type" : "type-598",
-   "return_type" : "type-599",
-   "self_type" : "type-598",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "referenced_type" : "type-16",
-   "return_type" : "type-17",
-   "self_type" : "type-16",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (const void *, void *, void *)",
-   "name" : "void (const void *, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "referenced_type" : "type-288",
-   "return_type" : "type-17",
-   "self_type" : "type-288",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-383"
-    }
-   ],
-   "referenced_type" : "type-655",
-   "return_type" : "type-17",
-   "self_type" : "type-655",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-550"
-    },
-    {
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-372",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-665"
-    },
-    {
-     "referenced_type" : "type-70"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-665"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-485"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-59",
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-514"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-657",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::sendObituary",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-536"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-121"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-128"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-524"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-821"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-668"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-661"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-664"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-664"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-664"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-664"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
-   "return_type" : "type-373",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMaxThreads",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::startThreadPool",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-380"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-373",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-153"
-    },
-    {
-     "referenced_type" : "type-380"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-325",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setCallRestriction",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-385"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getKernelReferences",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEmPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::becomeContextManager",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-378"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-382",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEmb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::self",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
-   "return_type" : "type-373",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Em",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Em",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-374"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhmPKymPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
-   "return_type" : "type-708",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::clearCaller",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::stopProcess",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setupPolling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-712"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::flushCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearLastError",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::executeCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-712"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-715"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-545"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-712"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEl",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::self",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
-   "return_type" : "type-708",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::process",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-373",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::shutdown",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::transact",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::sendReply",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::release_object",
-   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-687"
-    },
-    {
-     "referenced_type" : "type-87"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
-   "return_type" : "type-616",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::print",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    },
-    {
-     "referenced_type" : "type-383"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-614"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeFloat",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-95"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64El",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-100"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-11"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::finishWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvmPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeDouble",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-104"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeObject",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-87"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-822" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Em",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::restartWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeCString",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-383"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInplace",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-23",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::writePointer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::continueWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-290"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-380"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-80"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUnpadded",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::acquireObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::freeDataNoInit",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::releaseObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataCapacity",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeWeakBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-54"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeStrongBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-153"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhmPKymPFvPS1_S3_mS5_mPvES7_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-21"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-15"
-    },
-    {
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvmPmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-383"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
-   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::incrementNumReferences",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPmmmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-91"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-91"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
-   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlemm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-91"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPmmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::write",
-   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::remove",
-   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::freeData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::growData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setError",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::initState",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBool",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-18"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-595"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-595"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-36",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-657",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-53"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::onTransact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-823"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-55"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-36",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-287"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-121"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-128"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-139",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-18"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-824"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-36"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-587"
-    },
-    {
-     "referenced_type" : "type-453"
-    }
-   ],
-   "return_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-587"
-    },
-    {
-     "referenced_type" : "type-450"
-    }
-   ],
-   "return_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-293"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-23",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-538"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-23",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::isContextManager",
-   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-393"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-383",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isServingCall",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-711"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
-   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-619"
-    }
-   ],
-   "return_type" : "type-582",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::clearCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::errorCheck",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::findBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvmPbPmS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-105"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEmPmjmmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-104",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-108",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-826" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-96"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::scanForFds",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcDataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readCString",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-383",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-110",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::updateCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataCapacity",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::objectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-639"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-106"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-289",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcBufferSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPmPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readWeakBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::quickFindBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::enforceInterface",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-383"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-665"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-71",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEmPmmmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEmPmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::verifyBufferObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectmjmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-115"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16Inplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-290",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferChild",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferParent",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPmmmPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEmmPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-665"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEmPmmmPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-109"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebmm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-112"
-    },
-    {
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEmmPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::data",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-19",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::read",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvm",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-23"
-    },
-    {
-     "referenced_type" : "type-7"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::print",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-587"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcData",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::objects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-21",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-92"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataAvail",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-7",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-101"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-102",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-94"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-712"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPl",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-9",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::checkSubclass",
-   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-647"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-136"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-23",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-150"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-110"
-    }
-   ],
-   "return_type" : "type-14",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::getHWBinderKernelReferences",
-   "linker_set_key" : "getHWBinderKernelReferences",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "referenced_type" : "type-651"
-    }
-   ],
-   "return_type" : "type-100",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printHexData",
-   "linker_set_key" : "printHexData",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-9"
-    },
-    {
-     "referenced_type" : "type-110"
-    },
-    {
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-9"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-7"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-14"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-656"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printTypeCode",
-   "linker_set_key" : "printTypeCode",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-656"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::stringForIndent",
-   "linker_set_key" : "stringForIndent",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-9"
-    }
-   ],
-   "return_type" : "type-383",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "global_vars" :
- [
-  {
-   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
-   "name" : "android::hardware::gTextBuffers",
-   "referenced_type" : "type-622",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
-   "name" : "android::hardware::gProcessMutex",
-   "referenced_type" : "type-254",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aerrE",
-   "name" : "android::hardware::aerr",
-   "referenced_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4alogE",
-   "name" : "android::hardware::alog",
-   "referenced_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aoutE",
-   "name" : "android::hardware::aout",
-   "referenced_type" : "type-587",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware8gProcessE",
-   "name" : "android::hardware::gProcess",
-   "referenced_type" : "type-827",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  }
- ],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-254",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-261",
-   "self_type" : "type-267",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase *const &",
-   "name" : "android::RefBase *const &",
-   "referenced_type" : "type-676",
-   "self_type" : "type-699",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type *const &",
-   "name" : "android::RefBase::weakref_type *const &",
-   "referenced_type" : "type-674",
-   "self_type" : "type-695",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String16 &",
-   "name" : "android::String16 &",
-   "referenced_type" : "type-289",
-   "self_type" : "type-632",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-382",
-   "self_type" : "type-566",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *const &",
-   "name" : "android::hardware::BHwBinder *const &",
-   "referenced_type" : "type-672",
-   "self_type" : "type-691",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::HexDump &",
-   "name" : "android::hardware::HexDump &",
-   "referenced_type" : "type-455",
-   "self_type" : "type-596",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
-   "name" : "android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-326",
-   "self_type" : "type-360",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-161",
-   "self_type" : "type-160",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-388",
-   "self_type" : "type-387",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-448",
-   "self_type" : "type-587",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-323",
-   "self_type" : "type-337",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-487",
-   "self_type" : "type-500",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
-   "name" : "android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-545",
-   "self_type" : "type-705",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-581",
-   "self_type" : "type-606",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &",
-   "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-72",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
-   "name" : "android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-82",
-   "self_type" : "type-510",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
-   "name" : "android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-52",
-   "self_type" : "type-59",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char *const &",
-   "name" : "char *const &",
-   "referenced_type" : "type-118",
-   "self_type" : "type-122",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[10]",
-   "name" : "char const (&)[10]",
-   "referenced_type" : "type-727",
-   "self_type" : "type-729",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[11]",
-   "name" : "char const (&)[11]",
-   "referenced_type" : "type-749",
-   "self_type" : "type-751",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[12]",
-   "name" : "char const (&)[12]",
-   "referenced_type" : "type-723",
-   "self_type" : "type-725",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[13]",
-   "name" : "char const (&)[13]",
-   "referenced_type" : "type-720",
-   "self_type" : "type-722",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[14]",
-   "name" : "char const (&)[14]",
-   "referenced_type" : "type-768",
-   "self_type" : "type-770",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[15]",
-   "name" : "char const (&)[15]",
-   "referenced_type" : "type-126",
-   "self_type" : "type-129",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[16]",
-   "name" : "char const (&)[16]",
-   "referenced_type" : "type-753",
-   "self_type" : "type-755",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[17]",
-   "name" : "char const (&)[17]",
-   "referenced_type" : "type-771",
-   "self_type" : "type-773",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[18]",
-   "name" : "char const (&)[18]",
-   "referenced_type" : "type-756",
-   "self_type" : "type-758",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[19]",
-   "name" : "char const (&)[19]",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[20]",
-   "name" : "char const (&)[20]",
-   "referenced_type" : "type-765",
-   "self_type" : "type-767",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[22]",
-   "name" : "char const (&)[22]",
-   "referenced_type" : "type-790",
-   "self_type" : "type-792",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[25]",
-   "name" : "char const (&)[25]",
-   "referenced_type" : "type-780",
-   "self_type" : "type-782",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[28]",
-   "name" : "char const (&)[28]",
-   "referenced_type" : "type-802",
-   "self_type" : "type-804",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[29]",
-   "name" : "char const (&)[29]",
-   "referenced_type" : "type-777",
-   "self_type" : "type-779",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[2]",
-   "name" : "char const (&)[2]",
-   "referenced_type" : "type-731",
-   "self_type" : "type-733",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[31]",
-   "name" : "char const (&)[31]",
-   "referenced_type" : "type-762",
-   "self_type" : "type-764",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[32]",
-   "name" : "char const (&)[32]",
-   "referenced_type" : "type-793",
-   "self_type" : "type-796",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[35]",
-   "name" : "char const (&)[35]",
-   "referenced_type" : "type-784",
-   "self_type" : "type-786",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[37]",
-   "name" : "char const (&)[37]",
-   "referenced_type" : "type-774",
-   "self_type" : "type-776",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[3]",
-   "name" : "char const (&)[3]",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[4]",
-   "name" : "char const (&)[4]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-125",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[5]",
-   "name" : "char const (&)[5]",
-   "referenced_type" : "type-130",
-   "self_type" : "type-132",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[6]",
-   "name" : "char const (&)[6]",
-   "referenced_type" : "type-734",
-   "self_type" : "type-736",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[7]",
-   "name" : "char const (&)[7]",
-   "referenced_type" : "type-759",
-   "self_type" : "type-761",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[8]",
-   "name" : "char const (&)[8]",
-   "referenced_type" : "type-746",
-   "self_type" : "type-748",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char const (&)[9]",
-   "name" : "char const (&)[9]",
-   "referenced_type" : "type-737",
-   "self_type" : "type-739",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-555",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
-   "name" : "const android::hardware::BpHwBinder::Obituary &",
-   "referenced_type" : "type-494",
-   "self_type" : "type-524",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "referenced_type" : "type-501",
-   "self_type" : "type-502",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::HexDump &",
-   "name" : "const android::hardware::HexDump &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-5",
-   "self_type" : "type-45",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
-   "name" : "const android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-361",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::TypeCode &",
-   "name" : "const android::hardware::TypeCode &",
-   "referenced_type" : "type-451",
-   "self_type" : "type-450",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-322",
-   "self_type" : "type-324",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-486",
-   "self_type" : "type-488",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
-   "name" : "const android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-709",
-   "self_type" : "type-718",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-605",
-   "self_type" : "type-604",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-147",
-   "self_type" : "type-149",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-49",
-   "self_type" : "type-55",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-512",
-   "self_type" : "type-514",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-203",
-   "self_type" : "type-205",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-218",
-   "self_type" : "type-220",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-652",
-   "self_type" : "type-654",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
-   "name" : "const android::sp<android::hardware::IInterface> &",
-   "referenced_type" : "type-662",
-   "self_type" : "type-661",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
-   "name" : "const android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-544",
-   "self_type" : "type-687",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-81",
-   "self_type" : "type-121",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-477",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char &",
-   "name" : "const char &",
-   "referenced_type" : "type-384",
-   "self_type" : "type-602",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *const &",
-   "name" : "const char *const &",
-   "referenced_type" : "type-589",
-   "self_type" : "type-590",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-330",
-   "self_type" : "type-503",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-302",
-   "self_type" : "type-304",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-85",
-   "self_type" : "type-87",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-297",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-277",
-   "self_type" : "type-645",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-176",
-   "self_type" : "type-178",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const long &",
-   "name" : "const long &",
-   "referenced_type" : "type-138",
-   "self_type" : "type-175",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-481",
-   "self_type" : "type-482",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-479",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-251",
-   "self_type" : "type-255",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-713",
-   "self_type" : "type-715",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-301",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-78",
-   "self_type" : "type-80",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-480",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char *const &",
-   "name" : "const unsigned char *const &",
-   "referenced_type" : "type-797",
-   "self_type" : "type-798",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long &",
-   "name" : "const unsigned long &",
-   "referenced_type" : "type-187",
-   "self_type" : "type-231",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long *const &",
-   "name" : "const unsigned long *const &",
-   "referenced_type" : "type-799",
-   "self_type" : "type-801",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-22",
-   "self_type" : "type-726",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-483",
-   "self_type" : "type-484",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void *const &",
-   "name" : "const void *const &",
-   "referenced_type" : "type-489",
-   "self_type" : "type-490",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int &",
-   "name" : "int &",
-   "referenced_type" : "type-9",
-   "self_type" : "type-626",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-135",
-   "self_type" : "type-134",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-265",
-   "self_type" : "type-264",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-436",
-   "self_type" : "type-435",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-600",
-   "self_type" : "type-599",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-809",
-   "self_type" : "type-808",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *const &",
-   "name" : "void *const &",
-   "referenced_type" : "type-740",
-   "self_type" : "type-742",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-811",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-28",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-260",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-116",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-250",
-   "self_type" : "type-249",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-548",
-   "self_type" : "type-547",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-282",
-   "self_type" : "type-528",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-248",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-258",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-263",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-266",
-   "self_type" : "type-268",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-269",
-   "self_type" : "type-273",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-30",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase **",
-   "name" : "android::RefBase **",
-   "referenced_type" : "type-30",
-   "self_type" : "type-671",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase *const *",
-   "name" : "android::RefBase *const *",
-   "referenced_type" : "type-676",
-   "self_type" : "type-677",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-271",
-   "self_type" : "type-270",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-33",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-426",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-507",
-   "self_type" : "type-506",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-608",
-   "self_type" : "type-607",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type **",
-   "name" : "android::RefBase::weakref_type **",
-   "referenced_type" : "type-25",
-   "self_type" : "type-670",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_type *const *",
-   "name" : "android::RefBase::weakref_type *const *",
-   "referenced_type" : "type-674",
-   "self_type" : "type-675",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-504",
-   "self_type" : "type-505",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-351",
-   "self_type" : "type-350",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-515",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-639",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-577",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::RefBase *> *",
-   "name" : "android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-696",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-692",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-701",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-688",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-157",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-256",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-370",
-   "self_type" : "type-369",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-521",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-716",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-75",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-628",
-   "self_type" : "type-629",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-627",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-421",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder **",
-   "name" : "android::hardware::BHwBinder **",
-   "referenced_type" : "type-36",
-   "self_type" : "type-669",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder *const *",
-   "name" : "android::hardware::BHwBinder *const *",
-   "referenced_type" : "type-672",
-   "self_type" : "type-673",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-139",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BpHwBinder *",
-   "name" : "android::hardware::BpHwBinder *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-657",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
-   "name" : "android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-492",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-536",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BpHwRefBase *",
-   "name" : "android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-150",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput *",
-   "name" : "android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-613",
-   "self_type" : "type-614",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-192",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-198",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-617",
-   "self_type" : "type-616",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::HexDump *",
-   "name" : "android::hardware::HexDump *",
-   "referenced_type" : "type-455",
-   "self_type" : "type-595",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder *",
-   "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-53",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-298",
-   "self_type" : "type-664",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::IPCThreadState *",
-   "name" : "android::hardware::IPCThreadState *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-708",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-18",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::ProcessState *",
-   "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-374",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
-   "name" : "android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-326",
-   "self_type" : "type-325",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-592",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput *",
-   "name" : "android::hardware::TextOutput *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
-   "name" : "android::hardware::TextOutput::Bundle *",
-   "referenced_type" : "type-586",
-   "self_type" : "type-588",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TypeCode *",
-   "name" : "android::hardware::TypeCode *",
-   "referenced_type" : "type-452",
-   "self_type" : "type-593",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-323",
-   "self_type" : "type-327",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-491",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::Thread> *",
-   "name" : "android::sp<android::Thread> *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-346",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
-   "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-545",
-   "self_type" : "type-704",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-581",
-   "self_type" : "type-611",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-513",
-   "self_type" : "type-533",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> *",
-   "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
-   "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-550",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-128",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
-   "name" : "android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-485",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-379",
-   "self_type" : "type-378",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-105",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-364",
-   "self_type" : "type-366",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-530",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-511",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-354",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-517",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-615",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-549",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::RefBase *> *",
-   "name" : "const android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-697",
-   "self_type" : "type-698",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-694",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-703",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-690",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-359",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-630",
-   "self_type" : "type-631",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-624",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-185",
-   "self_type" : "type-190",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BHwBinder *",
-   "name" : "const android::hardware::BHwBinder *",
-   "referenced_type" : "type-133",
-   "self_type" : "type-136",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder *",
-   "name" : "const android::hardware::BpHwBinder *",
-   "referenced_type" : "type-275",
-   "self_type" : "type-293",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
-   "name" : "const android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-495",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-538",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BpHwRefBase *",
-   "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-156",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
-   "name" : "const android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-618",
-   "self_type" : "type-619",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::HexDump *",
-   "name" : "const android::hardware::HexDump *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-597",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-646",
-   "self_type" : "type-647",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
-   "name" : "const android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-531",
-   "self_type" : "type-532",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IInterface *",
-   "name" : "const android::hardware::IInterface *",
-   "referenced_type" : "type-667",
-   "self_type" : "type-668",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::IPCThreadState *",
-   "name" : "const android::hardware::IPCThreadState *",
-   "referenced_type" : "type-710",
-   "self_type" : "type-711",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Parcel *",
-   "name" : "const android::hardware::Parcel *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-77",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::ProcessState *",
-   "name" : "const android::hardware::ProcessState *",
-   "referenced_type" : "type-392",
-   "self_type" : "type-393",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
-   "name" : "const android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-328",
-   "self_type" : "type-329",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::TypeCode *",
-   "name" : "const android::hardware::TypeCode *",
-   "referenced_type" : "type-451",
-   "self_type" : "type-594",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-322",
-   "self_type" : "type-332",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-493",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::Thread> *",
-   "name" : "const android::sp<android::Thread> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-365",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
-   "name" : "const android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-709",
-   "self_type" : "type-719",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-605",
-   "self_type" : "type-612",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-512",
-   "self_type" : "type-535",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
-   "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-806",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
-   "name" : "const android::sp<android::hardware::IInterface> *",
-   "referenced_type" : "type-662",
-   "self_type" : "type-666",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
-   "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-544",
-   "self_type" : "type-551",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-520",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
-   "name" : "const android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-69",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-115",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const char16_t *",
-   "name" : "const char16_t *",
-   "referenced_type" : "type-291",
-   "self_type" : "type-290",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-308",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-108",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-277",
-   "self_type" : "type-625",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-177",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-91",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-91",
-   "self_type" : "type-112",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-20",
-   "self_type" : "type-19",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long *",
-   "name" : "const unsigned long *",
-   "referenced_type" : "type-187",
-   "self_type" : "type-800",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const unsigned long long *",
-   "name" : "const unsigned long long *",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const void **",
-   "name" : "const void **",
-   "referenced_type" : "type-110",
-   "self_type" : "type-109",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "double *",
-   "name" : "double *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "float *",
-   "name" : "float *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-101",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-243",
-   "self_type" : "type-244",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-712",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-184",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long *",
-   "name" : "long *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "short *",
-   "name" : "short *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "signed char *",
-   "name" : "signed char *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "referenced_type" : "type-598",
-   "self_type" : "type-601",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-10",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-98",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long *",
-   "name" : "unsigned long *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-651",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long long *",
-   "name" : "unsigned long long *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned short *",
-   "name" : "unsigned short *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void (*)(const void *, void *, void *)",
-   "name" : "void (*)(const void *, void *, void *)",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-655",
-   "self_type" : "type-656",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-23",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-23",
-   "self_type" : "type-246",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase *const",
-   "name" : "android::RefBase *const",
-   "referenced_type" : "type-30",
-   "self_type" : "type-676",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-166",
-   "self_type" : "type-168",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-197",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-210",
-   "self_type" : "type-212",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-225",
-   "self_type" : "type-227",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-237",
-   "self_type" : "type-239",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-270",
-   "self_type" : "type-272",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-33",
-   "self_type" : "type-32",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-341",
-   "self_type" : "type-343",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-426",
-   "self_type" : "type-429",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-506",
-   "self_type" : "type-508",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-56",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-607",
-   "self_type" : "type-609",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-648",
-   "self_type" : "type-650",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-658",
-   "self_type" : "type-660",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-684",
-   "self_type" : "type-686",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_type *const",
-   "name" : "android::RefBase::weakref_type *const",
-   "referenced_type" : "type-25",
-   "self_type" : "type-674",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::BHwBinder *const",
-   "name" : "android::hardware::BHwBinder *const",
-   "referenced_type" : "type-36",
-   "self_type" : "type-672",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::IBinder *const",
-   "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-53",
-   "self_type" : "type-145",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "char *const",
-   "name" : "char *const",
-   "referenced_type" : "type-119",
-   "self_type" : "type-118",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[10]",
-   "name" : "char const[10]",
-   "referenced_type" : "type-728",
-   "self_type" : "type-727",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[11]",
-   "name" : "char const[11]",
-   "referenced_type" : "type-750",
-   "self_type" : "type-749",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[12]",
-   "name" : "char const[12]",
-   "referenced_type" : "type-724",
-   "self_type" : "type-723",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[13]",
-   "name" : "char const[13]",
-   "referenced_type" : "type-721",
-   "self_type" : "type-720",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[14]",
-   "name" : "char const[14]",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[15]",
-   "name" : "char const[15]",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[16]",
-   "name" : "char const[16]",
-   "referenced_type" : "type-754",
-   "self_type" : "type-753",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[17]",
-   "name" : "char const[17]",
-   "referenced_type" : "type-772",
-   "self_type" : "type-771",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[18]",
-   "name" : "char const[18]",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[19]",
-   "name" : "char const[19]",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[20]",
-   "name" : "char const[20]",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[22]",
-   "name" : "char const[22]",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[25]",
-   "name" : "char const[25]",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[28]",
-   "name" : "char const[28]",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[29]",
-   "name" : "char const[29]",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[2]",
-   "name" : "char const[2]",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[31]",
-   "name" : "char const[31]",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[32]",
-   "name" : "char const[32]",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[35]",
-   "name" : "char const[35]",
-   "referenced_type" : "type-785",
-   "self_type" : "type-784",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[37]",
-   "name" : "char const[37]",
-   "referenced_type" : "type-775",
-   "self_type" : "type-774",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[3]",
-   "name" : "char const[3]",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[4]",
-   "name" : "char const[4]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[5]",
-   "name" : "char const[5]",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[6]",
-   "name" : "char const[6]",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[7]",
-   "name" : "char const[7]",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[8]",
-   "name" : "char const[8]",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[9]",
-   "name" : "char const[9]",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-810",
-   "self_type" : "type-812",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-363",
-   "self_type" : "type-364",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-282",
-   "self_type" : "type-529",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-31",
-   "self_type" : "type-509",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-351",
-   "self_type" : "type-353",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-516",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-289",
-   "self_type" : "type-381",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-382",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase *>",
-   "name" : "const android::Vector<android::RefBase *>",
-   "referenced_type" : "type-527",
-   "self_type" : "type-697",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
-   "name" : "const android::Vector<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-693",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-702",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
-   "name" : "const android::Vector<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-689",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-519",
-   "self_type" : "type-522",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-358",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-628",
-   "self_type" : "type-630",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<int>",
-   "name" : "const android::Vector<int>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-623",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BHwBinder",
-   "name" : "const android::hardware::BHwBinder",
-   "referenced_type" : "type-37",
-   "self_type" : "type-133",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder",
-   "name" : "const android::hardware::BpHwBinder",
-   "referenced_type" : "type-276",
-   "self_type" : "type-275",
-   "size" : 144,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
-   "name" : "const android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-294",
-   "self_type" : "type-494",
-   "size" : 32,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager",
-   "referenced_type" : "type-281",
-   "self_type" : "type-537",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-286",
-   "self_type" : "type-501",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwRefBase",
-   "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-144",
-   "self_type" : "type-155",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput",
-   "name" : "const android::hardware::BufferedTextOutput",
-   "referenced_type" : "type-613",
-   "self_type" : "type-618",
-   "size" : 72,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::HexDump",
-   "name" : "const android::hardware::HexDump",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder",
-   "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-39",
-   "self_type" : "type-646",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
-   "name" : "const android::hardware::IBinder::DeathRecipient",
-   "referenced_type" : "type-84",
-   "self_type" : "type-531",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IInterface",
-   "name" : "const android::hardware::IInterface",
-   "referenced_type" : "type-298",
-   "self_type" : "type-667",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IPCThreadState",
-   "name" : "const android::hardware::IPCThreadState",
-   "referenced_type" : "type-543",
-   "self_type" : "type-710",
-   "size" : 528,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "size" : 136,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState",
-   "name" : "const android::hardware::ProcessState",
-   "referenced_type" : "type-375",
-   "self_type" : "type-392",
-   "size" : 328,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
-   "name" : "const android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-326",
-   "self_type" : "type-328",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::TypeCode",
-   "name" : "const android::hardware::TypeCode",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
-   "size" : 32,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Thread>",
-   "name" : "const android::sp<android::Thread>",
-   "referenced_type" : "type-60",
-   "self_type" : "type-357",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
-   "name" : "const android::sp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-545",
-   "self_type" : "type-709",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "referenced_type" : "type-581",
-   "self_type" : "type-605",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-49",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-512",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-71",
-   "self_type" : "type-154",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
-   "name" : "const android::sp<android::hardware::IInterface>",
-   "referenced_type" : "type-663",
-   "self_type" : "type-662",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
-   "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-373",
-   "self_type" : "type-544",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
-   "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-14",
-   "self_type" : "type-63",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-120",
-   "self_type" : "type-384",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-383",
-   "self_type" : "type-589",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const char16_t",
-   "name" : "const char16_t",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-104",
-   "self_type" : "type-330",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-102",
-   "self_type" : "type-245",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-9",
-   "self_type" : "type-277",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-172",
-   "self_type" : "type-176",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const long",
-   "name" : "const long",
-   "referenced_type" : "type-100",
-   "self_type" : "type-138",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-95",
-   "self_type" : "type-481",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-93",
-   "self_type" : "type-478",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-252",
-   "self_type" : "type-251",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 16,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-713",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-11",
-   "self_type" : "type-20",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char *const",
-   "name" : "const unsigned char *const",
-   "referenced_type" : "type-19",
-   "self_type" : "type-797",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long",
-   "name" : "const unsigned long",
-   "referenced_type" : "type-7",
-   "self_type" : "type-187",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long *const",
-   "name" : "const unsigned long *const",
-   "referenced_type" : "type-800",
-   "self_type" : "type-799",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-13",
-   "self_type" : "type-22",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-97",
-   "self_type" : "type-483",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-17",
-   "self_type" : "type-111",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const void *const",
-   "name" : "const void *const",
-   "referenced_type" : "type-110",
-   "self_type" : "type-489",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-740",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-14",
-   "self_type" : "type-68",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile int",
-   "name" : "volatile int",
-   "referenced_type" : "type-9",
-   "self_type" : "type-278",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-504"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "d_",
-     "field_offset" : 64,
-     "referenced_type" : "type-611"
-    },
-    {
-     "access" : "private",
-     "field_name" : "s_",
-     "field_offset" : 128,
-     "referenced_type" : "type-612"
-    }
-   ],
-   "linker_set_key" : "Renamer",
-   "name" : "Renamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
-   "size" : 24,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mE7Renamer"
-    },
-    {
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mENK7RenamerclEm"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mEN7RenamerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_mEN7RenamerD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-700"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-67"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 48,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-351"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-289", "type-71" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-283"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-110", "type-286" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-3" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-65"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-262"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
-   "size" : 56,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-267"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-267"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-32"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-284"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "record_kind" : "class",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-352" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-284"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-285" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_m"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_m"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_m"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_m"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-290"
-    }
-   ],
-   "linker_set_key" : "android::String16",
-   "name" : "android::String16",
-   "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "unique_id" : "_ZTSN7android8String16E"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-383"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 64,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 192,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 512,
-     "referenced_type" : "type-66"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 896,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 928,
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 936,
-     "referenced_type" : "type-68"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 960,
-     "referenced_type" : "type-60"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 1024,
-     "referenced_type" : "type-9"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 152,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 136,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcim"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -136,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -136,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase *>",
-   "name" : "android::Vector<android::RefBase *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
-   "name" : "android::Vector<android::RefBase::weakref_type *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-382" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
-   "name" : "android::Vector<android::hardware::BHwBinder *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "record_kind" : "class",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-186"
-    }
-   ],
-   "linker_set_key" : "android::Vector<int>",
-   "name" : "android::Vector<int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android6VectorIiEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 192,
-     "referenced_type" : "type-74"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 256,
-     "referenced_type" : "type-187"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-186",
-   "self_type" : "type-186",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289", "type-71" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110", "type-286" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-39"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPolicy",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPriority",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExtras",
-     "field_offset" : 128,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReserved0",
-     "field_offset" : 192,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BHwBinder",
-   "name" : "android::hardware::BHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-39"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mHandle",
-     "field_offset" : 64,
-     "referenced_type" : "type-277"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlive",
-     "field_offset" : 416,
-     "referenced_type" : "type-278"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObitsSent",
-     "field_offset" : 448,
-     "referenced_type" : "type-278"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObituaries",
-     "field_offset" : 512,
-     "referenced_type" : "type-279"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 576,
-     "referenced_type" : "type-281"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mConstantData",
-     "field_offset" : 896,
-     "referenced_type" : "type-18"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDescriptorCache",
-     "field_offset" : 960,
-     "referenced_type" : "type-289"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder",
-   "name" : "android::hardware::BpHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
-   "size" : 144,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 128,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -128,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n32_N7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n40_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n48_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "recipient",
-     "referenced_type" : "type-82"
-    },
-    {
-     "field_name" : "cookie",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
-   "name" : "android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "referenced_type" : "type-282"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
-   "name" : "android::hardware::BpHwBinder::ObjectManager",
-   "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "object",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "cleanupCookie",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "func",
-     "field_offset" : 128,
-     "referenced_type" : "type-287"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRemote",
-     "field_offset" : 64,
-     "referenced_type" : "type-145"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 128,
-     "referenced_type" : "type-25"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 192,
-     "referenced_type" : "type-146"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwRefBase",
-   "name" : "android::hardware::BpHwRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-448"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSeq",
-     "field_offset" : 96,
-     "referenced_type" : "type-277"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "field_offset" : 128,
-     "referenced_type" : "type-277"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 160,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGlobalState",
-     "field_offset" : 512,
-     "referenced_type" : "type-582"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BufferedTextOutput",
-   "name" : "android::hardware::BufferedTextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 72,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
-     "referenced_type" : "type-110"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 64,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBytesPerLine",
-     "field_offset" : 128,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSingleLineCutoff",
-     "field_offset" : 192,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlignment",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCArrayStyle",
-     "field_offset" : 320,
-     "referenced_type" : "type-14"
-    }
-   ],
-   "linker_set_key" : "android::hardware::HexDump",
-   "name" : "android::hardware::HexDump",
-   "record_kind" : "class",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 48,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder",
-   "name" : "android::hardware::IBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
-   "name" : "android::hardware::IBinder::DeathRecipient",
-   "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IInterface",
-   "name" : "android::hardware::IInterface",
-   "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mProcess",
-     "referenced_type" : "type-544"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingStrongDerefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-525"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingWeakDerefs",
-     "field_offset" : 384,
-     "referenced_type" : "type-526"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteStrongDerefs",
-     "field_offset" : 704,
-     "referenced_type" : "type-527"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteWeakDerefs",
-     "field_offset" : 1024,
-     "referenced_type" : "type-526"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIn",
-     "field_offset" : 1344,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOut",
-     "field_offset" : 2432,
-     "referenced_type" : "type-6"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastError",
-     "field_offset" : 3520,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingPid",
-     "field_offset" : 3552,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingSid",
-     "field_offset" : 3584,
-     "referenced_type" : "type-383"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingUid",
-     "field_offset" : 3648,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStrictModePolicy",
-     "field_offset" : 3680,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastTransactionBinderFlags",
-     "field_offset" : 3712,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContextObject",
-     "field_offset" : 3776,
-     "referenced_type" : "type-545"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsLooper",
-     "field_offset" : 3840,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsPollingThread",
-     "field_offset" : 3848,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostCommandTasks",
-     "field_offset" : 3904,
-     "referenced_type" : "type-546"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIPCThreadStateBase",
-     "field_offset" : 4096,
-     "referenced_type" : "type-547"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 4160,
-     "referenced_type" : "type-385"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IPCThreadState",
-   "name" : "android::hardware::IPCThreadState",
-   "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
-   "size" : 528,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
-   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBufCachePos",
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufCache",
-     "field_offset" : 64,
-     "referenced_type" : "type-8"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mError",
-     "field_offset" : 256,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 320,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataSize",
-     "field_offset" : 384,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataCapacity",
-     "field_offset" : 448,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataPos",
-     "field_offset" : 512,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 576,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsSize",
-     "field_offset" : 640,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsCapacity",
-     "field_offset" : 704,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNextObjectHint",
-     "field_offset" : 768,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumRef",
-     "field_offset" : 832,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFdsKnown",
-     "field_offset" : 896,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHasFds",
-     "field_offset" : 904,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllowFds",
-     "field_offset" : 912,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 960,
-     "referenced_type" : "type-15"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnerCookie",
-     "field_offset" : 1024,
-     "referenced_type" : "type-23"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel",
-   "name" : "android::hardware::Parcel",
-   "record_kind" : "class",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6",
-   "size" : 136,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6ParcelE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "index",
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "buffer",
-     "field_offset" : 64,
-     "referenced_type" : "type-13"
-    },
-    {
-     "field_name" : "bufend",
-     "field_offset" : 128,
-     "referenced_type" : "type-13"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
-   "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-31"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDriverFD",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVMStart",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountLock",
-     "field_offset" : 192,
-     "referenced_type" : "type-376"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountDecrement",
-     "field_offset" : 512,
-     "referenced_type" : "type-377"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExecutingThreadsCount",
-     "field_offset" : 896,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMaxThreads",
-     "field_offset" : 960,
-     "referenced_type" : "type-7"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStarvationStartTimeMs",
-     "field_offset" : 1024,
-     "referenced_type" : "type-100"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 1088,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandleToObject",
-     "field_offset" : 1408,
-     "referenced_type" : "type-356"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mManagesContexts",
-     "field_offset" : 1728,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextCheckFunc",
-     "field_offset" : 1792,
-     "referenced_type" : "type-378"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextUserData",
-     "field_offset" : 1856,
-     "referenced_type" : "type-23"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContexts",
-     "field_offset" : 1920,
-     "referenced_type" : "type-363"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRootDir",
-     "field_offset" : 2240,
-     "referenced_type" : "type-382"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolStarted",
-     "field_offset" : 2304,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSpawnThreadOnStart",
-     "field_offset" : 2312,
-     "referenced_type" : "type-14"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolSeq",
-     "field_offset" : 2336,
-     "referenced_type" : "type-278"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMmapSize",
-     "field_offset" : 2368,
-     "referenced_type" : "type-187"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 2432,
-     "referenced_type" : "type-385"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState",
-   "name" : "android::hardware::ProcessState",
-   "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
-   "size" : 328,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 312,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -312,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -312,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "binder",
-     "referenced_type" : "type-53"
-    },
-    {
-     "field_name" : "refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
-   "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::TextOutput",
-   "name" : "android::hardware::TextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTO",
-     "referenced_type" : "type-587"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TextOutput::Bundle",
-   "name" : "android::hardware::TextOutput::Bundle",
-   "record_kind" : "class",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCode",
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TypeCode",
-   "name" : "android::hardware::TypeCode",
-   "record_kind" : "class",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-289"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 64,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289", "type-71" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-110"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 64,
-     "referenced_type" : "type-286"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
-   "size" : 32,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110", "type-286" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-61"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-62" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-36"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
-   "name" : "android::sp<android::hardware::BHwBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-37" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-582"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-584" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-83"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-84" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-53"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-39" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-664"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-298" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-374"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
-   "name" : "android::sp<android::hardware::ProcessState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-375" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
-   "name" : "android::trait_pointer<android::RefBase *>",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::String16>",
-   "name" : "android::trait_pointer<android::String16>",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<const void *>",
-   "name" : "android::trait_pointer<const void *>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<int>",
-   "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
-   "name" : "android::trait_trivial_copy<android::RefBase *>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
-   "name" : "android::trait_trivial_copy<android::String16>",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-120" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<const void *>",
-   "name" : "android::trait_trivial_copy<const void *>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-461" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
-   "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
-   "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase *>",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
-   "name" : "android::trait_trivial_ctor<android::String16>",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-120" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
-   "name" : "android::trait_trivial_ctor<const void *>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long long>",
-   "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-461" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
-   "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
-   "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
-   "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase *>",
-   "referenced_type" : "type-805",
-   "self_type" : "type-805",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
-   "name" : "android::trait_trivial_dtor<android::String16>",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-120" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
-   "name" : "android::trait_trivial_dtor<const void *>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long long>",
-   "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-461" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
-   "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
-   "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
-   "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
-   "name" : "android::trait_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String16>",
-   "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-382" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-120" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<const void *>",
-   "name" : "android::trait_trivial_move<const void *>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-104" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-461" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-100" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-11" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned int>",
-   "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long>",
-   "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase *>",
-   "name" : "android::traits<android::RefBase *>",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
-   "name" : "android::traits<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::String16>",
-   "name" : "android::traits<android::String16>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-289" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
-   "name" : "android::traits<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-71" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<const void *>",
-   "name" : "android::traits<const void *>",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-110" ],
-   "unique_id" : "_ZTSN7android6traitsIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<int>",
-   "name" : "android::traits<int>",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android6traitsIiEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-683"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
-   "name" : "android::use_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-30" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-681"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-25" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-679"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-499"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-294" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-334"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-326" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-336"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-497"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-487" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-643"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-581" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-423"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<int>",
-   "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-83"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-84" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-53"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 64,
-     "referenced_type" : "type-25"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder>",
-   "name" : "android::wp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-39" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-102"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-102"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-224"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-236"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-230"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-234"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 16,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 64,
-     "referenced_type" : "type-228"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 128,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 192,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 256,
-     "referenced_type" : "type-9"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-240"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-102"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-102"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-102"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-102"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 64,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 128,
-     "referenced_type" : "type-23"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 192,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 256,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 320,
-     "referenced_type" : "type-7"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 384,
-     "referenced_type" : "type-224"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 80,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-173"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-174"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-169"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-164"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-169",
-   "self_type" : "type-169",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-97"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-165"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-90"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "lock",
-     "referenced_type" : "type-621"
-    },
-    {
-     "field_name" : "has_tls",
-     "field_offset" : 320,
-     "referenced_type" : "type-9"
-    },
-    {
-     "field_name" : "tls",
-     "field_offset" : 352,
-     "referenced_type" : "type-9"
-    }
-   ],
-   "linker_set_key" : "thread_store_t",
-   "name" : "thread_store_t",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
-   "size" : 48,
-   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
-   "unique_id" : "thread_store_t"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "referenced_type" : "type-513",
-   "self_type" : "type-534",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
-   "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}
diff --git a/29/64/x86_x86_64/source-based/libhidlbase.so.lsdump b/29/64/x86_x86_64/source-based/libhidlbase.so.lsdump
index b903929..27a5247 100644
--- a/29/64/x86_x86_64/source-based/libhidlbase.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libhidlbase.so.lsdump
@@ -5,40 +5,274 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-664",
+   "referenced_type" : "type-43",
+   "self_type" : "type-175",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "char [10]",
+   "name" : "char [10]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3466",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [11]",
+   "name" : "char [11]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3492",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [12]",
+   "name" : "char [12]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3463",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [13]",
+   "name" : "char [13]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3459",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [14]",
+   "name" : "char [14]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3510",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [15]",
+   "name" : "char [15]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3608",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "char [16]",
    "name" : "char [16]",
-   "referenced_type" : "type-49",
-   "self_type" : "type-48",
+   "referenced_type" : "type-43",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "char [17]",
+   "name" : "char [17]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3513",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [18]",
+   "name" : "char [18]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3498",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [19]",
+   "name" : "char [19]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3529",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [20]",
+   "name" : "char [20]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3507",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [22]",
+   "name" : "char [22]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3532",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [25]",
+   "name" : "char [25]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3522",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [28]",
+   "name" : "char [28]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3544",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [29]",
+   "name" : "char [29]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3519",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [2]",
+   "name" : "char [2]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3470",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [31]",
+   "name" : "char [31]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3504",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [32]",
+   "name" : "char [32]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3535",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [35]",
+   "name" : "char [35]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3525",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [37]",
+   "name" : "char [37]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3516",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [3]",
+   "name" : "char [3]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3483",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [4]",
+   "name" : "char [4]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3605",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [5]",
+   "name" : "char [5]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3611",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [6]",
+   "name" : "char [6]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3474",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [7]",
+   "name" : "char [7]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3501",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [8]",
+   "name" : "char [8]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3487",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "char [9]",
+   "name" : "char [9]",
+   "referenced_type" : "type-43",
+   "self_type" : "type-3477",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-237",
+   "self_type" : "type-236",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-14",
+   "self_type" : "type-15",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [32]",
    "name" : "unsigned char [32]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-435",
+   "referenced_type" : "type-146",
+   "self_type" : "type-973",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46,8 +280,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-182",
-   "self_type" : "type-670",
+   "referenced_type" : "type-146",
+   "self_type" : "type-181",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -55,8 +289,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-102",
-   "self_type" : "type-713",
+   "referenced_type" : "type-44",
+   "self_type" : "type-227",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   }
@@ -69,8 +303,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1
   },
   {
@@ -78,8 +312,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1
   },
   {
@@ -88,8 +322,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 2
   },
   {
@@ -104,8 +338,8 @@
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 4
   },
   {
@@ -113,8 +347,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 4
   },
   {
@@ -122,8 +356,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4
   },
   {
@@ -131,8 +365,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-802",
-   "self_type" : "type-802",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 8
   },
   {
@@ -140,8 +374,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 2
   },
   {
@@ -149,8 +383,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-927",
-   "self_type" : "type-927",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 1
   },
   {
@@ -159,8 +393,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 1
   },
   {
@@ -169,8 +403,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 4
   },
   {
@@ -179,8 +413,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4
   },
   {
@@ -189,8 +423,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 8
   },
   {
@@ -199,15 +433,15 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108"
+   "referenced_type" : "type-77",
+   "self_type" : "type-77"
   }
  ],
  "elf_functions" :
@@ -218,10 +452,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware25PassthroughServiceManagerEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android4base9ParseUintIyEEbPKcPT_S4_b"
   },
   {
@@ -1173,6 +1423,78 @@
    "name" : "_ZN7android4hidl7manager4V1_218BpHwServiceManagerC2ERKNS_2spINS_8hardware7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE"
   },
   {
@@ -1203,6 +1525,36 @@
    "name" : "_ZN7android8hardware10HidlMemoryD2Ev"
   },
   {
+   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware10TextOutputD2Ev"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
@@ -1219,6 +1571,30 @@
    "name" : "_ZN7android8hardware10fromBinderINS_4hidl7manager4V1_215IServiceManagerENS4_18BpHwServiceManagerENS4_18BnHwServiceManagerEEENS_2spIT_EERKNS8_INS0_7IBinderEEE"
   },
   {
+   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware11hidl_handle10freeHandleEv"
   },
   {
@@ -1330,18 +1706,243 @@
    "name" : "_ZN7android8hardware11hidl_stringaSERKS1_"
   },
   {
+   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware13writeToParcelERKNS0_6StatusEPNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
+  },
+  {
    "name" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE"
   },
   {
    "name" : "_ZN7android8hardware14readFromParcelERKNS0_6ParcelE"
   },
   {
+   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_"
   },
   {
@@ -1354,9 +1955,45 @@
    "name" : "_ZN7android8hardware16setRequestingSidERKNS_2spINS_4hidl4base4V1_05IBaseEEEb"
   },
   {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android8hardware17joinRpcThreadpoolEv"
   },
   {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE"
   },
   {
@@ -1375,6 +2012,9 @@
    "name" : "_ZN7android8hardware20LazyServiceRegistrarC2Ev"
   },
   {
+   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
+  },
+  {
    "name" : "_ZN7android8hardware21defaultServiceManagerEv"
   },
   {
@@ -1441,6 +2081,184 @@
    "name" : "_ZN7android8hardware31setProcessHidlReturnRestrictionENS0_21HidlReturnRestrictionE"
   },
   {
+   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel6removeEjj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8growDataEj"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9initStateEv"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
+  },
+  {
+   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware6ParcelD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware6Status11fromStatusTEi"
   },
   {
@@ -1471,6 +2289,30 @@
    "name" : "_ZN7android8hardware6StatusC2EiiPKc"
   },
   {
+   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware7IBinderD2Ev"
+  },
+  {
    "name" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE"
   },
   {
@@ -1650,12 +2492,75 @@
    "name" : "_ZN7android8hardware7details25registerAsServiceInternalERKNS_2spINS_4hidl4base4V1_05IBaseEEERKNSt3__112basic_stringIcNSA_11char_traitsIcEENSA_9allocatorIcEEEE"
   },
   {
+   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
+  },
+  {
+   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
+  },
+  {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE"
   },
   {
    "name" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_6StatusE"
   },
   {
+   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv"
   },
   {
@@ -1677,12 +2582,259 @@
    "name" : "_ZNK7android8hardware11hidl_stringcvNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEEv"
   },
   {
+   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4dataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
+  },
+  {
+   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
+  },
+  {
    "name" : "_ZNK7android8hardware6Status11descriptionEv"
   },
   {
+   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+  },
+  {
    "name" : "_ZNK7android8hardware7details13return_status8assertOkEv"
   },
   {
+   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNKSt3__110__back_refIcE6__execERNS_7__stateIcEE"
   },
@@ -2539,13 +3691,79 @@
    "name" : "_ZTv0_n12_N7android4hidl7manager4V1_218BnHwServiceManagerD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+  },
+  {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD0Ev"
   },
   {
    "name" : "_ZTv0_n12_N7android8hardware10HidlMemoryD1Ev"
   },
   {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+  },
+  {
    "name" : "__udivdi3"
+  },
+  {
+   "name" : "getHWBinderKernelReferences"
+  },
+  {
+   "name" : "printHexData"
+  },
+  {
+   "name" : "printTypeCode"
+  },
+  {
+   "name" : "stringForIndent"
   }
  ],
  "elf_objects" :
@@ -2597,6 +3815,21 @@
    "name" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE"
   },
   {
+   "name" : "_ZN7android8hardware12gTextBuffersE"
+  },
+  {
+   "name" : "_ZN7android8hardware13gProcessMutexE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aerrE"
+  },
+  {
+   "name" : "_ZN7android8hardware4alogE"
+  },
+  {
+   "name" : "_ZN7android8hardware4aoutE"
+  },
+  {
    "name" : "_ZN7android8hardware7details14gServiceSidMapE"
   },
   {
@@ -2612,6 +3845,9 @@
    "name" : "_ZN7android8hardware7details6gBnMapE"
   },
   {
+   "name" : "_ZN7android8hardware8gProcessE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android4hidl4base4V1_06BsBaseE0_NS2_5IBaseE"
   },
@@ -2807,6 +4043,13 @@
    "name" : "_ZTCN7android4hidl7manager4V1_218BpHwServiceManagerE8_NS_8hardware11BpHwRefBaseE"
   },
   {
+   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE0_NS4_5IBaseE"
   },
@@ -2836,6 +4079,9 @@
    "name" : "_ZTCN7android8hardware7details6WaiterE0_NS_4hidl7manager4V1_020IServiceNotificationE"
   },
   {
+   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE0_NS_13basic_istreamIcS2_EE"
   },
@@ -2853,6 +4099,18 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTCNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_ostreamIcS2_EE"
   },
   {
@@ -2910,16 +4168,31 @@
    "name" : "_ZTTN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "name" : "_ZTTN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTTN7android8hardware10IInterfaceE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
+   "name" : "_ZTTN7android8hardware12ProcessStateE"
+  },
+  {
    "name" : "_ZTTN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTTN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTTN7android8hardware7details21ClientCounterCallbackE"
   },
   {
@@ -2927,6 +4200,9 @@
    "name" : "_ZTTN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTTN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTNSt3__113basic_fstreamIcNS_11char_traitsIcEEEE"
   },
@@ -2939,6 +4215,14 @@
    "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
    "name" : "_ZTVN7android4hidl4base4V1_05IBaseE"
   },
   {
@@ -3017,20 +4301,85 @@
    "name" : "_ZTVN7android4hidl7manager4V1_218BpHwServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorIiEE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10BpHwBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware10HidlMemoryE"
   },
   {
+   "name" : "_ZTVN7android8hardware10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware10PoolThreadE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware10TextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android8hardware11BpInterfaceINS_4hidl4base4V1_05IBaseEEE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android8hardware12FdTextOutputE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware12ProcessStateE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware13LogTextOutputE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android8hardware25PassthroughServiceManagerE"
   },
   {
    "name" : "_ZTVN7android8hardware27hidl_binder_death_recipientE"
   },
   {
+   "name" : "_ZTVN7android8hardware7IBinderE"
+  },
+  {
    "name" : "_ZTVN7android8hardware7details16HidlInstrumentorE"
   },
   {
@@ -3041,6 +4390,9 @@
    "name" : "_ZTVN7android8hardware7details6WaiterE"
   },
   {
+   "name" : "_ZTVN7android8hardware9BHwBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__110__back_refIcEE"
   },
@@ -3126,6 +4478,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
   },
   {
@@ -3202,11 +4558,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -3220,11 +4576,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -3238,11 +4594,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -3264,11 +4620,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -3294,11 +4650,11 @@
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>::GrantorType",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EE11GrantorTypeE"
   },
   {
@@ -3316,11 +4672,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-276",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -3329,6 +4685,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-14",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -3370,11 +4752,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -3424,11 +4806,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -3450,11 +4832,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -3468,11 +4850,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-14",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager11PidConstantE"
   },
   {
@@ -3494,11 +4876,11 @@
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
-   "underlying_type" : "type-182",
+   "underlying_type" : "type-146",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager9TransportE"
   },
   {
@@ -3544,11 +4926,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-694",
-   "self_type" : "type-694",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -3598,11 +4980,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -3624,11 +5006,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-219",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -3666,11 +5048,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -3908,11 +5290,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-698",
-   "self_type" : "type-698",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -3938,11 +5320,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -3968,11 +5350,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4010,11 +5392,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-228",
+   "self_type" : "type-228",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_component"
   },
   {
@@ -4048,11 +5430,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_flex_format"
   },
   {
@@ -4074,11 +5456,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-216",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -4092,11 +5474,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-221",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -4122,11 +5504,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-225",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -4216,11 +5598,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-696",
-   "self_type" : "type-696",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -4258,11 +5640,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -4276,11 +5658,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -4306,11 +5688,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -4340,11 +5722,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-697",
-   "self_type" : "type-697",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "android_transform_t"
   },
   {
@@ -4394,11 +5776,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-695",
-   "self_type" : "type-695",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-102",
+   "underlying_type" : "type-44",
    "unique_id" : "log_id"
   }
  ],
@@ -4406,18 +5788,138 @@
  [
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    }
+   ],
+   "referenced_type" : "type-2291",
+   "return_type" : "type-2287",
+   "self_type" : "type-2291",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-694"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2241",
+   "return_type" : "type-29",
+   "self_type" : "type-2241",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (void *)",
    "name" : "int (void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     }
    ],
-   "referenced_type" : "type-728",
-   "return_type" : "type-17",
-   "self_type" : "type-728",
+   "referenced_type" : "type-242",
+   "return_type" : "type-14",
+   "self_type" : "type-242",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2303"
+    }
+   ],
+   "referenced_type" : "type-2302",
+   "return_type" : "type-2303",
+   "self_type" : "type-2302",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2165"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2164",
+   "return_type" : "type-77",
+   "self_type" : "type-2164",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (const void *, void *, void *)",
+   "name" : "void (const void *, void *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "referenced_type" : "type-2158",
+   "return_type" : "type-77",
+   "self_type" : "type-2158",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (void *, const char *)",
+   "name" : "void (void *, const char *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "referenced_type" : "type-3397",
+   "return_type" : "type-77",
+   "self_type" : "type-3397",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "functions" :
@@ -4429,10 +5931,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-966"
+     "referenced_type" : "type-539"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-448"
+    },
+    {
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-3653",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -4442,29 +5960,77 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-157"
+     "referenced_type" : "type-743"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-435"
+    },
+    {
+     "referenced_type" : "type-436"
+    }
+   ],
+   "return_type" : "type-438",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-435"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-438",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
+   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2193"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-3567",
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
    "function_name" : "android::hidl::base::V1_0::IBase::linkToDeath",
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4474,13 +6040,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2118"
+     "referenced_type" : "type-2560"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4490,13 +6056,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2119"
+     "referenced_type" : "type-2561"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4506,13 +6072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4522,13 +6088,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2120"
+     "referenced_type" : "type-2562"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4538,13 +6104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2563"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4554,10 +6120,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4567,10 +6133,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4580,10 +6146,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4593,16 +6159,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4611,14 +6177,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
@@ -4629,13 +6195,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-2124"
+     "referenced_type" : "type-2566"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4645,13 +6211,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4661,13 +6227,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1826"
+     "referenced_type" : "type-2064"
     },
     {
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h"
   },
   {
@@ -4676,19 +6242,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2127"
+     "referenced_type" : "type-2569"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4698,27 +6264,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2128"
+     "referenced_type" : "type-2570"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4727,19 +6293,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2129"
+     "referenced_type" : "type-2571"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4750,13 +6316,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-2130"
+     "referenced_type" : "type-2572"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4765,19 +6331,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2131"
+     "referenced_type" : "type-2573"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4786,19 +6352,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2132"
+     "referenced_type" : "type-2574"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4807,19 +6373,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2133"
+     "referenced_type" : "type-2575"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4828,19 +6394,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2134"
+     "referenced_type" : "type-2576"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4849,19 +6415,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1857"
+     "referenced_type" : "type-2094"
     },
     {
-     "referenced_type" : "type-1858"
+     "referenced_type" : "type-2095"
     },
     {
-     "referenced_type" : "type-2135"
+     "referenced_type" : "type-2577"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4872,10 +6438,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4885,13 +6451,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4901,19 +6467,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4923,13 +6489,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4939,19 +6505,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     },
     {
-     "referenced_type" : "type-1854"
+     "referenced_type" : "type-2091"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4961,10 +6527,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4974,10 +6540,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4987,10 +6553,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
   {
@@ -4999,13 +6565,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5014,19 +6580,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5036,16 +6602,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5055,13 +6621,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2136"
+     "referenced_type" : "type-2578"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5071,13 +6637,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2137"
+     "referenced_type" : "type-2579"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5087,13 +6653,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5103,13 +6669,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2138"
+     "referenced_type" : "type-2580"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5118,16 +6684,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2139"
+     "referenced_type" : "type-2581"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5136,16 +6702,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2140"
+     "referenced_type" : "type-2582"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5155,13 +6721,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-2141"
+     "referenced_type" : "type-2583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5170,16 +6736,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2142"
+     "referenced_type" : "type-2584"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5189,10 +6755,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5202,10 +6768,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5214,16 +6780,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-2143"
+     "referenced_type" : "type-2585"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5232,13 +6798,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5247,13 +6813,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1829"
+     "referenced_type" : "type-2067"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5263,10 +6829,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5276,16 +6842,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5295,13 +6861,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5311,13 +6877,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-920"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
   {
@@ -5327,14 +6893,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5344,16 +6910,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5363,13 +6929,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1036"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5379,13 +6945,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1416"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5395,14 +6961,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5412,13 +6978,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5428,13 +6994,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1417"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5444,14 +7010,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5461,13 +7027,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-1039"
+     "referenced_type" : "type-1418"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5477,10 +7043,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5490,10 +7056,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5502,13 +7068,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5518,10 +7084,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5531,16 +7097,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5549,14 +7115,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5565,14 +7131,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
@@ -5583,13 +7149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1421"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5599,13 +7165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5615,13 +7181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-918"
     },
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h"
   },
   {
@@ -5630,19 +7196,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1048"
+     "referenced_type" : "type-1427"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5652,27 +7218,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1428"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5683,13 +7249,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-1050"
+     "referenced_type" : "type-1429"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5698,19 +7264,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-1430"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5719,19 +7285,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1052"
+     "referenced_type" : "type-1431"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5740,19 +7306,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1053"
+     "referenced_type" : "type-1432"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5761,19 +7327,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1054"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5782,19 +7348,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1055"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5805,10 +7371,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5817,19 +7383,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1056"
+     "referenced_type" : "type-1435"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5838,19 +7404,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-1057"
+     "referenced_type" : "type-1436"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5860,13 +7426,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5876,13 +7442,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     },
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5892,10 +7458,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5905,10 +7471,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5918,10 +7484,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-829"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
   {
@@ -5930,16 +7496,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-1058"
+     "referenced_type" : "type-1437"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5949,16 +7515,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5968,13 +7534,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1059"
+     "referenced_type" : "type-1438"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -5984,13 +7550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1060"
+     "referenced_type" : "type-1439"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6000,16 +7566,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6019,13 +7585,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6035,13 +7601,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1061"
+     "referenced_type" : "type-1440"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6050,16 +7616,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-1062"
+     "referenced_type" : "type-1441"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6069,16 +7635,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1063"
+     "referenced_type" : "type-1442"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6087,19 +7653,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6109,13 +7675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1064"
+     "referenced_type" : "type-1443"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6124,19 +7690,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1065"
+     "referenced_type" : "type-1444"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6146,10 +7712,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6159,10 +7725,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6172,19 +7738,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6194,16 +7760,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6212,22 +7778,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6236,19 +7802,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6258,16 +7824,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6277,16 +7843,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6296,13 +7862,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1066"
+     "referenced_type" : "type-1445"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6312,10 +7878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6325,16 +7891,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6343,19 +7909,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6364,19 +7930,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6386,13 +7952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-1067"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6402,13 +7968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6418,13 +7984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-919"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
   {
@@ -6434,14 +8000,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6451,16 +8017,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6470,13 +8036,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1068"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6486,13 +8052,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1069"
+     "referenced_type" : "type-1448"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6502,14 +8068,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6519,13 +8085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6535,13 +8101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1070"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6551,14 +8117,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6568,13 +8134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-1071"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6584,10 +8150,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6597,10 +8163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6609,13 +8175,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6625,10 +8191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6638,16 +8204,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6656,14 +8222,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6672,14 +8238,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
@@ -6690,13 +8256,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1453"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6706,13 +8272,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6722,13 +8288,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-1046"
     },
     {
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h"
   },
   {
@@ -6737,19 +8303,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1034"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1005"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6758,19 +8324,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-1034"
     },
     {
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1001"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IHwServiceManager.h"
   },
   {
@@ -6780,27 +8346,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1088"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1077"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6811,13 +8377,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-1078"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6826,19 +8392,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-1087"
     },
     {
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1088"
     },
     {
-     "referenced_type" : "type-1079"
+     "referenced_type" : "type-1458"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6849,10 +8415,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6862,13 +8428,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6878,13 +8444,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6894,10 +8460,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6907,10 +8473,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6920,10 +8486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-821"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
   {
@@ -6933,16 +8499,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6952,13 +8518,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1080"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6968,13 +8534,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1081"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -6984,13 +8550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7000,13 +8566,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1082"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7016,19 +8582,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7038,13 +8604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-1083"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7053,22 +8619,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-1049"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7078,10 +8644,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7091,10 +8657,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7104,10 +8670,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7117,16 +8683,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7136,13 +8702,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7152,13 +8718,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-938"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
   {
@@ -7168,14 +8734,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7185,16 +8751,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7204,13 +8770,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1084"
+     "referenced_type" : "type-1463"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7220,13 +8786,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1085"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7236,14 +8802,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7253,13 +8819,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7269,13 +8835,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1086"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7285,14 +8851,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7302,13 +8868,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-1087"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7318,10 +8884,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7331,10 +8897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7343,13 +8909,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7359,10 +8925,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7372,16 +8938,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7390,14 +8956,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7406,14 +8972,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7422,14 +8988,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
@@ -7440,13 +9006,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-1090"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7456,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7472,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-1100"
     },
     {
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h"
   },
   {
@@ -7488,27 +9054,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1145"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1146"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1475"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7519,13 +9085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1476"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7534,19 +9100,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1145"
     },
     {
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-1146"
     },
     {
-     "referenced_type" : "type-1098"
+     "referenced_type" : "type-1477"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7557,10 +9123,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7570,13 +9136,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7586,13 +9152,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     },
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7602,10 +9168,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7615,10 +9181,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7628,10 +9194,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-269"
+     "referenced_type" : "type-838"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
   {
@@ -7641,16 +9207,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7660,13 +9226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1099"
+     "referenced_type" : "type-1478"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7676,13 +9242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1100"
+     "referenced_type" : "type-1479"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7692,16 +9258,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7711,13 +9277,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7727,13 +9293,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1101"
+     "referenced_type" : "type-1480"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7743,16 +9309,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-1481"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7762,13 +9328,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1482"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7778,10 +9344,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7791,10 +9357,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7804,19 +9370,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7826,16 +9392,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7845,19 +9411,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7866,22 +9432,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-608"
+     "referenced_type" : "type-1104"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7891,16 +9457,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7910,16 +9476,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7929,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1483"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7945,10 +9511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7958,16 +9524,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7977,13 +9543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-1105"
+     "referenced_type" : "type-1484"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -7993,13 +9559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8009,13 +9575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1101"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
   {
@@ -8025,14 +9591,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8042,16 +9608,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8061,13 +9627,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2144"
+     "referenced_type" : "type-2586"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8077,13 +9643,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2145"
+     "referenced_type" : "type-2587"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8093,14 +9659,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8110,13 +9676,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8126,13 +9692,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2146"
+     "referenced_type" : "type-2588"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8142,14 +9708,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8159,13 +9725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-2147"
+     "referenced_type" : "type-2589"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8175,10 +9741,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8188,10 +9754,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8200,13 +9766,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8216,10 +9782,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8229,16 +9795,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8247,14 +9813,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8263,14 +9829,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
@@ -8280,14 +9846,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8297,16 +9863,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8316,13 +9882,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2148"
+     "referenced_type" : "type-2590"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8332,13 +9898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2149"
+     "referenced_type" : "type-2591"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8348,14 +9914,14 @@
    [
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8365,13 +9931,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8381,13 +9947,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2150"
+     "referenced_type" : "type-2592"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8397,14 +9963,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8414,13 +9980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-2151"
+     "referenced_type" : "type-2593"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8430,10 +9996,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8443,10 +10009,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8455,13 +10021,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8471,10 +10037,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8484,16 +10050,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8502,14 +10068,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8518,14 +10084,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-867"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8534,14 +10100,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-115"
+     "referenced_type" : "type-718"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8550,14 +10116,14 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
@@ -8568,13 +10134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-2154"
+     "referenced_type" : "type-2596"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8584,13 +10150,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8600,13 +10166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-1930"
     },
     {
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h"
   },
   {
@@ -8617,13 +10183,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-2159"
+     "referenced_type" : "type-2601"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8633,13 +10199,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8649,13 +10215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1772"
+     "referenced_type" : "type-2005"
     },
     {
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h"
   },
   {
@@ -8665,27 +10231,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
-     "referenced_type" : "type-1757"
+     "referenced_type" : "type-1988"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2166"
+     "referenced_type" : "type-2608"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8696,13 +10262,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-2167"
+     "referenced_type" : "type-2609"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8711,19 +10277,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1756"
+     "referenced_type" : "type-1987"
     },
     {
-     "referenced_type" : "type-1757"
+     "referenced_type" : "type-1988"
     },
     {
-     "referenced_type" : "type-2168"
+     "referenced_type" : "type-2610"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8734,10 +10300,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8747,13 +10313,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8763,13 +10329,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8779,10 +10345,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8792,10 +10358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8805,10 +10371,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-847"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
   {
@@ -8818,27 +10384,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2611"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8849,13 +10415,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-2170"
+     "referenced_type" : "type-2612"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8864,19 +10430,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2171"
+     "referenced_type" : "type-2613"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8885,19 +10451,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2172"
+     "referenced_type" : "type-2614"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8906,19 +10472,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2173"
+     "referenced_type" : "type-2615"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8927,19 +10493,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2174"
+     "referenced_type" : "type-2616"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8948,19 +10514,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-304"
     },
     {
-     "referenced_type" : "type-1802"
+     "referenced_type" : "type-2040"
     },
     {
-     "referenced_type" : "type-1803"
+     "referenced_type" : "type-2041"
     },
     {
-     "referenced_type" : "type-2175"
+     "referenced_type" : "type-2617"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8971,10 +10537,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -8984,13 +10550,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9000,13 +10566,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     },
     {
-     "referenced_type" : "type-125"
+     "referenced_type" : "type-727"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9016,10 +10582,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9029,10 +10595,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9042,10 +10608,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-854"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
   {
@@ -9055,16 +10621,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9074,13 +10640,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2176"
+     "referenced_type" : "type-2618"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9090,13 +10656,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2177"
+     "referenced_type" : "type-2619"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9106,13 +10672,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9122,13 +10688,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2620"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9137,19 +10703,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-1936"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9159,13 +10725,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2621"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9175,10 +10741,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9188,10 +10754,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9201,10 +10767,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9214,16 +10780,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9233,16 +10799,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9252,13 +10818,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9268,13 +10834,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1707"
+     "referenced_type" : "type-1931"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
   {
@@ -9284,16 +10850,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9303,19 +10869,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9325,13 +10891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2622"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9341,13 +10907,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2623"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9357,16 +10923,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-180",
+   "return_type" : "type-765",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9376,19 +10942,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9398,13 +10964,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9414,13 +10980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2182"
+     "referenced_type" : "type-2624"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9430,16 +10996,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2183"
+     "referenced_type" : "type-2625"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9448,22 +11014,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9472,22 +11038,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9497,13 +11063,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2184"
+     "referenced_type" : "type-2626"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9513,10 +11079,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9526,10 +11092,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9539,22 +11105,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9564,16 +11130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2185"
+     "referenced_type" : "type-2627"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9583,19 +11149,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9605,16 +11171,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9624,16 +11190,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9643,19 +11209,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-738"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9664,25 +11230,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9691,19 +11257,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-2186"
+     "referenced_type" : "type-2628"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9712,19 +11278,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-2010"
     },
     {
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-152"
+     "referenced_type" : "type-742"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9734,16 +11300,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9753,16 +11319,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-172",
+   "return_type" : "type-758",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9772,13 +11338,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2187"
+     "referenced_type" : "type-2629"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9788,10 +11354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9801,16 +11367,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1003"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9820,13 +11386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-2188"
+     "referenced_type" : "type-2630"
     }
    ],
-   "return_type" : "type-104",
+   "return_type" : "type-120",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9836,13 +11402,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
@@ -9852,25 +11418,435 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-733"
     },
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2218"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-2147",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::sendObituary",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2236"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2172"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-906"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-2227"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2631"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
+   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::HidlMemory::getInstance",
    "linker_set_key" : "_ZN7android8hardware10HidlMemory11getInstanceEONS0_11hidl_memoryE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-65"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9879,10 +11855,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9891,16 +11867,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
-   "return_type" : "type-347",
+   "return_type" : "type-93",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9911,19 +11887,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9934,10 +11910,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9948,19 +11924,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9971,10 +11947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9984,10 +11960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -9997,10 +11973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10010,24 +11986,155 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-94"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3410"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::asBinder",
+   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3405"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::IInterface::IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3407"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3407"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3407"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IInterface::~IInterface",
+   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3407"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3708"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3708"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3708"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::TextOutput::~TextOutput",
+   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3708"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::fromBinder",
    "linker_set_key" : "_ZN7android8hardware10fromBinderINS_4hidl4base4V1_05IBaseENS4_8BpHwBaseENS4_8BnHwBaseEEENS_2spIT_EERKNS8_INS0_7IBinderEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-35", "type-373", "type-229" ]
+   "template_args" : [ "type-302", "type-368", "type-299" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10035,12 +12142,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-148", "type-249", "type-247" ]
+   "template_args" : [ "type-495", "type-822", "type-820" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10048,12 +12155,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-156", "type-279", "type-277" ]
+   "template_args" : [ "type-498", "type-848", "type-846" ]
   },
   {
    "function_name" : "android::hardware::fromBinder",
@@ -10061,12 +12168,139 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-694"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
-   "template_args" : [ "type-129", "type-131", "type-228" ]
+   "template_args" : [ "type-517", "type-729", "type-803" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
+   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "access" : "private",
@@ -10076,10 +12310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10089,17 +12323,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10109,13 +12343,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10125,13 +12359,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10141,13 +12375,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10157,10 +12391,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10170,13 +12404,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10186,13 +12420,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10202,13 +12436,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10218,10 +12452,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10231,10 +12465,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10244,10 +12478,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10257,13 +12491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-33"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10273,13 +12507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10289,13 +12523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-30"
     },
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-87",
+   "return_type" : "type-34",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10305,16 +12539,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10324,10 +12558,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10338,16 +12572,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10358,13 +12592,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10374,13 +12608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10390,13 +12624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10406,16 +12640,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10425,13 +12659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10441,13 +12675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10457,10 +12691,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10470,13 +12704,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10486,13 +12720,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10502,16 +12736,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10521,13 +12755,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10537,13 +12771,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10553,10 +12787,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10566,10 +12800,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10579,10 +12813,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10592,13 +12826,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-188"
+     "referenced_type" : "type-55"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10608,13 +12842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10624,13 +12858,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-54"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -10640,28 +12874,437 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-190",
+   "return_type" : "type-57",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getMaxThreads",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::startThreadPool",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-295"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setContextObject",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-694"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-3619",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setCallRestriction",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getKernelReferences",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::becomeContextManager",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2243"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-165",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-2194",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::ProcessState::self",
+   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::ProcessState::~ProcessState",
+   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2254"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
    "function_name" : "android::hardware::writeToParcel",
    "linker_set_key" : "_ZN7android8hardware13writeToParcelERKNS0_12hidl_versionERNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-75"
     },
     {
-     "referenced_type" : "type-787"
+     "referenced_type" : "type-321"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10670,28 +13313,721 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2165"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
+   "return_type" : "type-3448",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::clearCaller",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::stopProcess",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setupPolling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::flushCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearLastError",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::executeCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-3454"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-425"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-336",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-336"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::self",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
+   "return_type" : "type-3448",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::process",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-444",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::shutdown",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::transact",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::sendReply",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
+   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3448"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
    "function_name" : "android::hardware::readFromParcel",
    "linker_set_key" : "_ZN7android8hardware14readFromParcelEPNS0_6StatusERKNS0_6ParcelE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10700,31 +14036,49 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     }
    ],
-   "return_type" : "type-265",
+   "return_type" : "type-72",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
+   "function_name" : "android::hardware::release_object",
+   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-3430"
+    },
+    {
+     "referenced_type" : "type-3582"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::interfacesEqual",
    "linker_set_key" : "_ZN7android8hardware15interfacesEqualERKNS_2spINS_4hidl4base4V1_05IBaseEEES8_",
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::handleBinderPoll",
    "linker_set_key" : "_ZN7android8hardware16handleBinderPollEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10733,37 +14087,174 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::joinRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware17joinRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
+   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
+   "return_type" : "type-2318",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::print",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "referenced_type" : "type-41"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
+   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2317"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::addPostCommandTask",
    "linker_set_key" : "_ZN7android8hardware18addPostCommandTaskENSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-324"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::setupBinderPolling",
    "linker_set_key" : "_ZN7android8hardware18setupBinderPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10772,10 +14263,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10785,17 +14276,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-489"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10805,10 +14296,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
@@ -10818,16 +14309,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-930"
+     "referenced_type" : "type-486"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager",
    "linker_set_key" : "_ZN7android8hardware21defaultServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -10836,22 +14327,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
    "function_name" : "android::hardware::setupTransportPolling",
    "linker_set_key" : "_ZN7android8hardware21setupTransportPollingEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10860,19 +14351,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10881,19 +14372,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10902,19 +14393,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-319"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10923,13 +14414,13 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -10938,19 +14429,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10959,19 +14450,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-63"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -10980,19 +14471,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     },
     {
-     "referenced_type" : "type-784"
+     "referenced_type" : "type-318"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11001,28 +14492,28 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-72",
+   "return_type" : "type-383",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::joinBinderRpcThreadpool",
    "linker_set_key" : "_ZN7android8hardware23joinBinderRpcThreadpoolEv",
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::defaultServiceManager1_2",
    "linker_set_key" : "_ZN7android8hardware24defaultServiceManager1_2Ev",
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11032,13 +14523,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-315"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11048,10 +14539,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
-   "return_type" : "type-359",
+   "return_type" : "type-307",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11061,19 +14552,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11083,19 +14574,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     },
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-79"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -11104,25 +14595,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager",
    "linker_set_key" : "_ZN7android8hardware28getPassthroughServiceManagerEv",
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::getPassthroughServiceManager1_1",
    "linker_set_key" : "_ZN7android8hardware31getPassthroughServiceManager1_1Ev",
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11131,22 +14622,950 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-119"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::Parcel::writeFloat",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-237"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-151"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-336"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-146"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::finishWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeDouble",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-6"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeObject",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3582"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3897" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-71"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint32",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUint64",
+   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-16"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::restartWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeCString",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInplace",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::writePointer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::continueWrite",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-287"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-295"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeString16",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3579"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeUnpadded",
+   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::acquireObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::freeDataNoInit",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::releaseObjects",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataCapacity",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeWeakBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-3563"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeStrongBinder",
+   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-694"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2165"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2163"
+    },
+    {
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
+   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
+   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::incrementNumReferences",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
+   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
+   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
+   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::write",
+   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::remove",
+   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-990"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::freeData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::growData",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setError",
+   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::initState",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeBool",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::writeInt8",
+   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "referenced_type" : "type-483"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::~Parcel",
+   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2159"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::fromStatusT",
    "linker_set_key" : "_ZN7android8hardware6Status11fromStatusTEi",
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11156,16 +15575,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11175,13 +15594,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11190,10 +15609,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11202,19 +15621,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "function_name" : "android::hardware::Status::ok",
    "linker_set_key" : "_ZN7android8hardware6Status2okEv",
-   "return_type" : "type-106",
+   "return_type" : "type-103",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11225,16 +15644,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11245,19 +15664,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11268,16 +15687,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11288,35 +15707,162 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-106"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2298"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::HexDump::HexDump",
+   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2298"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-2144",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::remoteBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-2147",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::IBinder::IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::IBinder::~IBinder",
+   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2141"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::TaskRunner::push",
    "linker_set_key" : "_ZN7android8hardware7details10TaskRunner4pushERKNSt3__18functionIFvvEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-734"
+     "referenced_type" : "type-248"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11326,13 +15872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     },
     {
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11342,10 +15888,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11355,10 +15901,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11368,10 +15914,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
@@ -11381,16 +15927,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-240"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "function_name" : "android::hardware::details::debuggable",
    "linker_set_key" : "_ZN7android8hardware7details10debuggableEv",
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -11399,18 +15945,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-402",
+   "return_type" : "type-945",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-114", "type-35", "type-261" ]
+   "template_args" : [ "type-504", "type-302", "type-830" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11418,18 +15964,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-542",
+   "return_type" : "type-1054",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-148", "type-35", "type-249" ]
+   "template_args" : [ "type-495", "type-302", "type-822" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11437,18 +15983,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-35", "type-270" ]
+   "template_args" : [ "type-514", "type-302", "type-839" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11456,18 +16002,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-615",
+   "return_type" : "type-1111",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-113", "type-114", "type-270" ]
+   "template_args" : [ "type-514", "type-504", "type-839" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11475,18 +16021,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1716",
+   "return_type" : "type-1946",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-156", "type-35", "type-279" ]
+   "template_args" : [ "type-498", "type-302", "type-848" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11494,18 +16040,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-35", "type-131" ]
+   "template_args" : [ "type-517", "type-302", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11513,18 +16059,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-114", "type-131" ]
+   "template_args" : [ "type-517", "type-504", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::castInterface",
@@ -11532,18 +16078,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-1782",
+   "return_type" : "type-2016",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-129", "type-113", "type-131" ]
+   "template_args" : [ "type-517", "type-514", "type-729" ]
   },
   {
    "function_name" : "android::hardware::details::getDescriptor",
@@ -11551,10 +16097,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
-   "return_type" : "type-1120",
+   "return_type" : "type-1491",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
@@ -11564,10 +16110,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11577,10 +16123,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11590,13 +16136,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-113"
     },
     {
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-114"
     }
    ],
-   "return_type" : "type-693",
+   "return_type" : "type-205",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
@@ -11605,10 +16151,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11617,12 +16163,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-35", "type-108" ]
+   "template_args" : [ "type-302", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11630,12 +16176,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-148", "type-108" ]
+   "template_args" : [ "type-495", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::wrapPassthrough",
@@ -11643,12 +16189,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h",
-   "template_args" : [ "type-156", "type-108" ]
+   "template_args" : [ "type-498", "type-77" ]
   },
   {
    "access" : "protected",
@@ -11658,13 +16204,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-142"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11675,14 +16221,14 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11693,13 +16239,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-96"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11709,16 +16255,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11728,16 +16274,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     },
     {
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-35"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11747,10 +16293,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11760,10 +16306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11773,10 +16319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-998"
+     "referenced_type" : "type-583"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11785,23 +16331,23 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-411",
+   "return_type" : "type-249",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportUtils.h"
   },
   {
    "function_name" : "android::hardware::details::getPidIfSharable",
    "linker_set_key" : "_ZN7android8hardware7details16getPidIfSharableEv",
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
   {
@@ -11810,19 +16356,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
    "function_name" : "android::hardware::details::getVndkVersionStr",
    "linker_set_key" : "_ZN7android8hardware7details17getVndkVersionStrEv",
-   "return_type" : "type-1121",
+   "return_type" : "type-630",
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
@@ -11831,18 +16377,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-1009"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-258",
+   "return_type" : "type-526",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-261", "type-114", "type-108", "type-108" ]
+   "template_args" : [ "type-830", "type-504", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11850,18 +16396,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-1074"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-146",
+   "return_type" : "type-542",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-249", "type-148", "type-108", "type-108" ]
+   "template_args" : [ "type-822", "type-495", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11869,18 +16415,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-635"
+     "referenced_type" : "type-1132"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-111",
+   "return_type" : "type-531",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-270", "type-113", "type-108", "type-108" ]
+   "template_args" : [ "type-839", "type-514", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11888,18 +16434,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1740"
+     "referenced_type" : "type-1969"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-154",
+   "return_type" : "type-548",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-279", "type-156", "type-108", "type-108" ]
+   "template_args" : [ "type-848", "type-498", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getServiceInternal",
@@ -11907,29 +16453,29 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1807"
+     "referenced_type" : "type-2045"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-127",
+   "return_type" : "type-537",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h",
-   "template_args" : [ "type-131", "type-129", "type-108", "type-108" ]
+   "template_args" : [ "type-729", "type-517", "type-77", "type-77" ]
   },
   {
    "function_name" : "android::hardware::details::getBnConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBnConstructorMapEv",
-   "return_type" : "type-320",
+   "return_type" : "type-884",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "function_name" : "android::hardware::details::getBsConstructorMap",
    "linker_set_key" : "_ZN7android8hardware7details19getBsConstructorMapEv",
-   "return_type" : "type-326",
+   "return_type" : "type-885",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
@@ -11938,19 +16484,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11959,10 +16505,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
-   "return_type" : "type-173",
+   "return_type" : "type-300",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlPassthroughSupport.h"
   },
   {
@@ -11971,10 +16517,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
@@ -11983,28 +16529,363 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-863"
+     "referenced_type" : "type-412"
     },
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-806"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-14",
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
   {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::onTransact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2632"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::linkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-2170"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::localBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-2144",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::attachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::detachObject",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-2172"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-906"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-29"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-2175",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::transact",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-2167"
+    },
+    {
+     "referenced_type" : "type-2159"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-2633"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
+   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2144"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "referenced_type" : "type-3712"
+    }
+   ],
+   "return_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "function_name" : "android::hardware::operator<<",
+   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "referenced_type" : "type-3709"
+    }
+   ],
+   "return_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "function_name" : "android::hardware::operator<<",
    "linker_set_key" : "_ZN7android8hardwarelsERNSt3__113basic_ostreamIcNS1_11char_traitsIcEEEERKNS0_11hidl_stringE",
    "parameters" :
    [
     {
-     "referenced_type" : "type-191"
+     "referenced_type" : "type-58"
     },
     {
-     "referenced_type" : "type-151"
+     "referenced_type" : "type-48"
     }
    ],
-   "return_type" : "type-191",
+   "return_type" : "type-58",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12013,26 +16894,58 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-691"
+     "referenced_type" : "type-203"
     },
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-108"
     }
    ],
-   "return_type" : "type-691",
+   "return_type" : "type-203",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::BpHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2185"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
+   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2238"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
    "function_name" : "android::hardware::hidl_handle::getNativeHandle",
    "linker_set_key" : "_ZNK7android8hardware11hidl_handle15getNativeHandleEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12042,10 +16955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12055,10 +16968,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-93"
+     "referenced_type" : "type-37"
     }
    ],
-   "return_type" : "type-14",
+   "return_type" : "type-11",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12068,10 +16981,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-102",
+   "return_type" : "type-44",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12081,10 +16994,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-100",
+   "return_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12094,10 +17007,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-45",
+   "return_type" : "type-29",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12107,37 +17020,1519 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
-   "return_type" : "type-1137",
+   "return_type" : "type-643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "function_name" : "android::hardware::ProcessState::isContextManager",
+   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3659"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::isServingCall",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
+   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3451"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
+   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2321"
+    }
+   ],
+   "return_type" : "type-2282",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::clearCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::errorCheck",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::findBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3590"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3589"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readDouble",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-6",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-3593",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "template_args" : [ "type-3898" ]
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3585"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-2162"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-16",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::scanForFds",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcDataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readCString",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-78",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readPointer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::updateCache",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataCapacity",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::objectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-297"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3591"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-286",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcBufferSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3594"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3590"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readWeakBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-2194",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::quickFindBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::setDataPosition",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::enforceInterface",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-41"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-435"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-383",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::verifyBufferObject",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3598"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readString16Inplace",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferChild",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::validateBufferParent",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3594"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3590"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-435"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3594"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3595"
+    },
+    {
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-3595"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::data",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-990",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::read",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-188"
+    },
+    {
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::print",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-2287"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::ipcData",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::hardware::Parcel::objects",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-2165",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataSize",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3590"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readBool",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3583"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::dataAvail",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-44",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3588"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readFloat",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-237",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt16",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3584"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-475"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt32",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-3587"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readInt64",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    }
+   ],
+   "return_type" : "type-336",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "function_name" : "android::hardware::Parcel::readUint8",
+   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-3576"
+    },
+    {
+     "referenced_type" : "type-230"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "function_name" : "android::hardware::Status::description",
    "linker_set_key" : "_ZNK7android8hardware6Status11descriptionEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-111"
     }
    ],
-   "return_type" : "type-1138",
+   "return_type" : "type-644",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
+   "function_name" : "android::hardware::IBinder::checkSubclass",
+   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2143"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
    "function_name" : "android::hardware::details::return_status::assertOk",
    "linker_set_key" : "_ZNK7android8hardware7details13return_status8assertOkEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-118"
     }
    ],
-   "return_type" : "type-108",
+   "return_type" : "type-77",
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "function_name" : "android::hardware::BHwBinder::findObject",
+   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2174"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-188",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
+   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
+   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2147"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
+   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2181"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "return_type" : "type-29",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "function_name" : "android::hardware::getHWBinderKernelReferences",
+   "linker_set_key" : "getHWBinderKernelReferences",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "referenced_type" : "type-1002"
+    }
+   ],
+   "return_type" : "type-14",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printHexData",
+   "linker_set_key" : "printHexData",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    },
+    {
+     "referenced_type" : "type-78"
+    },
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-14"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-29"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3398"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::printTypeCode",
+   "linker_set_key" : "printTypeCode",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-44"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-3398"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "return_type" : "type-77",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "function_name" : "android::hardware::stringForIndent",
+   "linker_set_key" : "stringForIndent",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-14"
+    }
+   ],
+   "return_type" : "type-41",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
   }
  ],
  "global_vars" :
@@ -12145,80 +18540,116 @@
   {
    "linker_set_key" : "_ZN7android4hidl4base4V1_05IBase10descriptorE",
    "name" : "android::hidl::base::V1_0::IBase::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_015IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_020IServiceNotification10descriptorE",
    "name" : "android::hidl::manager::V1_0::IServiceNotification::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_115IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_1::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IClientCallback10descriptorE",
    "name" : "android::hidl::manager::V1_2::IClientCallback::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
   {
    "linker_set_key" : "_ZN7android4hidl7manager4V1_215IServiceManager10descriptorE",
    "name" : "android::hidl::manager::V1_2::IServiceManager::descriptor",
-   "referenced_type" : "type-100",
+   "referenced_type" : "type-41",
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_handle21kOffsetOfNativeHandleE",
    "name" : "android::hardware::hidl_handle::kOffsetOfNativeHandle",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory13kOffsetOfNameE",
    "name" : "android::hardware::hidl_memory::kOffsetOfName",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_memory15kOffsetOfHandleE",
    "name" : "android::hardware::hidl_memory::kOffsetOfHandle",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware11hidl_string15kOffsetOfBufferE",
    "name" : "android::hardware::hidl_string::kOffsetOfBuffer",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-189",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
+   "name" : "android::hardware::gTextBuffers",
+   "referenced_type" : "type-2324",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
+   "name" : "android::hardware::gProcessMutex",
+   "referenced_type" : "type-393",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aerrE",
+   "name" : "android::hardware::aerr",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4alogE",
+   "name" : "android::hardware::alog",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware4aoutE",
+   "name" : "android::hardware::aout",
+   "referenced_type" : "type-2287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "linker_set_key" : "_ZN7android8hardware7details14gServiceSidMapE",
    "name" : "android::hardware::details::gServiceSidMap",
-   "referenced_type" : "type-1140",
+   "referenced_type" : "type-646",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details15gServicePrioMapE",
    "name" : "android::hardware::details::gServicePrioMap",
-   "referenced_type" : "type-1141",
+   "referenced_type" : "type-647",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "linker_set_key" : "_ZN7android8hardware7details6gBnMapE",
    "name" : "android::hardware::details::gBnMap",
-   "referenced_type" : "type-822",
+   "referenced_type" : "type-361",
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
+  },
+  {
+   "linker_set_key" : "_ZN7android8hardware8gProcessE",
+   "name" : "android::hardware::gProcess",
+   "referenced_type" : "type-2634",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
   }
  ],
  "lvalue_reference_types" :
@@ -12227,8 +18658,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-839",
-   "self_type" : "type-844",
+   "referenced_type" : "type-388",
+   "self_type" : "type-393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -12236,17 +18667,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-850",
-   "self_type" : "type-855",
+   "referenced_type" : "type-399",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const &",
+   "name" : "android::RefBase *const &",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const &",
+   "name" : "android::RefBase::weakref_type *const &",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-763",
-   "self_type" : "type-773",
+   "referenced_type" : "type-286",
+   "self_type" : "type-296",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12254,17 +18703,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-654",
-   "self_type" : "type-659",
+   "referenced_type" : "type-165",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *const &",
+   "name" : "android::hardware::BHwBinder *const &",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3434",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> &",
-   "referenced_type" : "type-30",
-   "self_type" : "type-50",
+   "referenced_type" : "type-664",
+   "self_type" : "type-676",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12272,8 +18730,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> &",
-   "referenced_type" : "type-42",
-   "self_type" : "type-53",
+   "referenced_type" : "type-670",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12281,8 +18739,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-326",
+   "referenced_type" : "type-587",
+   "self_type" : "type-885",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
@@ -12290,17 +18748,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-347",
+   "self_type" : "type-884",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump &",
+   "name" : "android::hardware::HexDump &",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2299",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1222",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12308,8 +18775,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12317,17 +18784,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel &",
    "name" : "android::hardware::Parcel &",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel &",
+   "name" : "android::hardware::Parcel &",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
+   "name" : "android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &",
-   "referenced_type" : "type-180",
-   "self_type" : "type-185",
+   "referenced_type" : "type-765",
+   "self_type" : "type-768",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12335,8 +18820,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &",
-   "referenced_type" : "type-172",
-   "self_type" : "type-177",
+   "referenced_type" : "type-758",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12344,8 +18829,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &",
-   "referenced_type" : "type-402",
-   "self_type" : "type-405",
+   "referenced_type" : "type-945",
+   "self_type" : "type-948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12353,8 +18838,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12362,8 +18847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &",
-   "referenced_type" : "type-615",
-   "self_type" : "type-618",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12371,8 +18856,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12380,8 +18865,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2019",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12389,8 +18874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-411",
-   "self_type" : "type-738",
+   "referenced_type" : "type-249",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12398,8 +18883,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-497",
+   "referenced_type" : "type-120",
+   "self_type" : "type-123",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12407,17 +18892,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-106",
-   "self_type" : "type-418",
+   "referenced_type" : "type-103",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2287",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-512",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12425,8 +18964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> &",
-   "referenced_type" : "type-425",
-   "self_type" : "type-508",
+   "referenced_type" : "type-571",
+   "self_type" : "type-1032",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12434,8 +18973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-236",
+   "referenced_type" : "type-793",
+   "self_type" : "type-809",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12443,8 +18982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &",
    "name" : "android::hardware::details::hidl_pointer<const char> &",
-   "referenced_type" : "type-98",
-   "self_type" : "type-317",
+   "referenced_type" : "type-39",
+   "self_type" : "type-86",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12452,8 +18991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-12",
-   "self_type" : "type-999",
+   "referenced_type" : "type-9",
+   "self_type" : "type-584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12461,8 +19000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> &",
    "name" : "android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-194",
-   "self_type" : "type-200",
+   "referenced_type" : "type-473",
+   "self_type" : "type-780",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12470,8 +19009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &",
    "name" : "android::hardware::details::return_status &",
-   "referenced_type" : "type-105",
-   "self_type" : "type-693",
+   "referenced_type" : "type-112",
+   "self_type" : "type-205",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12479,8 +19018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> &",
    "name" : "android::hardware::hidl_array<unsigned char, 32> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-516",
+   "referenced_type" : "type-972",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12488,8 +19027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &",
    "name" : "android::hardware::hidl_handle &",
-   "referenced_type" : "type-77",
-   "self_type" : "type-87",
+   "referenced_type" : "type-28",
+   "self_type" : "type-34",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12497,8 +19036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-201",
-   "self_type" : "type-226",
+   "referenced_type" : "type-60",
+   "self_type" : "type-64",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12506,8 +19045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &",
    "name" : "android::hardware::hidl_string &",
-   "referenced_type" : "type-97",
-   "self_type" : "type-190",
+   "referenced_type" : "type-38",
+   "self_type" : "type-57",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12515,8 +19054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-430",
-   "self_type" : "type-439",
+   "referenced_type" : "type-968",
+   "self_type" : "type-977",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12524,8 +19063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-429",
+   "referenced_type" : "type-570",
+   "self_type" : "type-967",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12533,8 +19072,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-994",
+   "referenced_type" : "type-575",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12542,8 +19081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &",
    "name" : "android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-206",
-   "self_type" : "type-208",
+   "referenced_type" : "type-472",
+   "self_type" : "type-786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12551,17 +19090,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-219",
-   "self_type" : "type-246",
+   "referenced_type" : "type-502",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
+   "name" : "android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-425",
+   "self_type" : "type-3444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &",
    "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-72",
-   "self_type" : "type-888",
+   "referenced_type" : "type-383",
+   "self_type" : "type-438",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
+   "name" : "android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-444",
+   "self_type" : "type-3653",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12569,8 +19153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> &",
    "name" : "android::sp<android::hardware::details::Waiter> &",
-   "referenced_type" : "type-158",
-   "self_type" : "type-161",
+   "referenced_type" : "type-744",
+   "self_type" : "type-747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12578,8 +19162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-356",
-   "self_type" : "type-399",
+   "referenced_type" : "type-908",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12587,8 +19171,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-173",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-300",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12596,8 +19180,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-258",
-   "self_type" : "type-392",
+   "referenced_type" : "type-526",
+   "self_type" : "type-936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12605,8 +19189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-395",
+   "referenced_type" : "type-542",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12614,8 +19198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-124",
+   "referenced_type" : "type-531",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12623,8 +19207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-548",
+   "self_type" : "type-1944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12632,8 +19216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-127",
-   "self_type" : "type-140",
+   "referenced_type" : "type-537",
+   "self_type" : "type-734",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12641,8 +19225,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &",
    "name" : "android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-797",
-   "self_type" : "type-874",
+   "referenced_type" : "type-331",
+   "self_type" : "type-424",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-901",
+   "self_type" : "type-2216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
+   "name" : "android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-3567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12650,17 +19252,269 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-33",
-   "self_type" : "type-864",
+   "referenced_type" : "type-309",
+   "self_type" : "type-413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "char *const &",
+   "name" : "char *const &",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3602",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[10]",
+   "name" : "char const (&)[10]",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3468",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[11]",
+   "name" : "char const (&)[11]",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3493",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[12]",
+   "name" : "char const (&)[12]",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3464",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[13]",
+   "name" : "char const (&)[13]",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3461",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[14]",
+   "name" : "char const (&)[14]",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3511",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[15]",
+   "name" : "char const (&)[15]",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3609",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[16]",
+   "name" : "char const (&)[16]",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3495",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[17]",
+   "name" : "char const (&)[17]",
+   "referenced_type" : "type-3512",
+   "self_type" : "type-3514",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[18]",
+   "name" : "char const (&)[18]",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[19]",
+   "name" : "char const (&)[19]",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3530",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[20]",
+   "name" : "char const (&)[20]",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3508",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[22]",
+   "name" : "char const (&)[22]",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3533",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[25]",
+   "name" : "char const (&)[25]",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[28]",
+   "name" : "char const (&)[28]",
+   "referenced_type" : "type-3543",
+   "self_type" : "type-3545",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[29]",
+   "name" : "char const (&)[29]",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3520",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[2]",
+   "name" : "char const (&)[2]",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[31]",
+   "name" : "char const (&)[31]",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3505",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[32]",
+   "name" : "char const (&)[32]",
+   "referenced_type" : "type-3534",
+   "self_type" : "type-3536",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[35]",
+   "name" : "char const (&)[35]",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[37]",
+   "name" : "char const (&)[37]",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3517",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[3]",
+   "name" : "char const (&)[3]",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3485",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[4]",
+   "name" : "char const (&)[4]",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3606",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[5]",
+   "name" : "char const (&)[5]",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3612",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[6]",
+   "name" : "char const (&)[6]",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[7]",
+   "name" : "char const (&)[7]",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3502",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[8]",
+   "name" : "char const (&)[8]",
+   "referenced_type" : "type-3486",
+   "self_type" : "type-3490",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char const (&)[9]",
+   "name" : "char const (&)[9]",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-770",
-   "self_type" : "type-772",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12668,35 +19522,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-656",
-   "self_type" : "type-658",
+   "referenced_type" : "type-167",
+   "self_type" : "type-169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1200",
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
+   "name" : "const android::hardware::BpHwBinder::Obituary &",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2227",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump &",
+   "name" : "const android::hardware::HexDump &",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-3712",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1540",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12704,8 +19567,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12713,8 +19576,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1783",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1921",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1987",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -12722,8 +19621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2040",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12731,8 +19630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2094",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -12740,8 +19639,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2367",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12749,8 +19657,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-473",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2922",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12758,8 +19666,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-588",
-   "self_type" : "type-590",
+   "referenced_type" : "type-3002",
+   "self_type" : "type-3004",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -12767,8 +19675,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-646",
-   "self_type" : "type-648",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3060",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -12776,17 +19684,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3124",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-316",
+   "self_type" : "type-318",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3173",
+   "self_type" : "type-3175",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3224",
+   "self_type" : "type-3226",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3689",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-999",
+   "self_type" : "type-1001",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
+   "name" : "const android::hardware::ProcessState::handle_entry &",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3643",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> &",
    "name" : "const android::hardware::Return<bool> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-409",
+   "referenced_type" : "type-459",
+   "self_type" : "type-952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12794,8 +19756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<void> &",
    "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-109",
+   "referenced_type" : "type-715",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12803,17 +19765,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-413",
+   "referenced_type" : "type-107",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode &",
+   "name" : "const android::hardware::TypeCode &",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-3709",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::SchedPrio &",
    "name" : "const android::hardware::details::SchedPrio &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-483",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12821,8 +19792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> &",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> &",
-   "referenced_type" : "type-11",
-   "self_type" : "type-76",
+   "referenced_type" : "type-8",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12830,8 +19801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> &",
    "name" : "const android::hardware::details::hidl_pointer<int> &",
-   "referenced_type" : "type-210",
-   "self_type" : "type-209",
+   "referenced_type" : "type-491",
+   "self_type" : "type-787",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12839,8 +19810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-80",
+   "referenced_type" : "type-31",
+   "self_type" : "type-32",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12848,8 +19819,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-222",
-   "self_type" : "type-223",
+   "referenced_type" : "type-62",
+   "self_type" : "type-63",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12857,8 +19828,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-141",
-   "self_type" : "type-151",
+   "referenced_type" : "type-47",
+   "self_type" : "type-48",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12866,8 +19837,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > &",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12875,8 +19846,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> &",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-573",
+   "self_type" : "type-1003",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12884,8 +19855,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> &",
-   "referenced_type" : "type-445",
-   "self_type" : "type-477",
+   "referenced_type" : "type-982",
+   "self_type" : "type-1004",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -12893,8 +19864,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> &",
-   "referenced_type" : "type-995",
-   "self_type" : "type-997",
+   "referenced_type" : "type-580",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12902,8 +19873,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> &",
    "name" : "const android::hardware::hidl_vec<int> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-922",
+   "referenced_type" : "type-476",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12911,8 +19882,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-276",
-   "self_type" : "type-292",
+   "referenced_type" : "type-73",
+   "self_type" : "type-75",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12920,8 +19891,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const &",
    "name" : "const android::hidl::base::V1_0::IBase *const &",
-   "referenced_type" : "type-811",
-   "self_type" : "type-812",
+   "referenced_type" : "type-345",
+   "self_type" : "type-346",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -12929,26 +19900,134 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-510",
+   "referenced_type" : "type-981",
+   "self_type" : "type-1034",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-71",
-   "self_type" : "type-70",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
+   "name" : "const android::sp<android::hardware::BHwBinder> &",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2170",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3289",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2336",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3387",
+   "self_type" : "type-3389",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3394",
+   "self_type" : "type-3396",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-439",
+   "self_type" : "type-694",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
+   "name" : "const android::sp<android::hardware::IInterface> &",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3405",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager> &",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager> &",
-   "referenced_type" : "type-117",
-   "self_type" : "type-123",
+   "referenced_type" : "type-719",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
+   "name" : "const android::sp<android::hardware::ProcessState> &",
+   "referenced_type" : "type-449",
+   "self_type" : "type-3430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12956,8 +20035,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-363",
+   "referenced_type" : "type-907",
+   "self_type" : "type-913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12965,8 +20044,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-80",
+   "self_type" : "type-79",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12974,8 +20053,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-861",
-   "self_type" : "type-863",
+   "referenced_type" : "type-410",
+   "self_type" : "type-412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -12983,8 +20062,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> &",
-   "referenced_type" : "type-299",
-   "self_type" : "type-298",
+   "referenced_type" : "type-529",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12992,8 +20071,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
+   "referenced_type" : "type-545",
+   "self_type" : "type-738",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13001,8 +20080,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-115",
+   "referenced_type" : "type-534",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13010,8 +20089,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-553",
+   "self_type" : "type-742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13019,8 +20098,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> &",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-540",
+   "self_type" : "type-727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13028,8 +20107,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> &",
    "name" : "const android::wp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-872",
-   "self_type" : "type-873",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1215",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-312",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
+   "name" : "const android::wp<android::hardware::IBinder> &",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13037,26 +20161,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
    "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1197",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1911",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-781",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3660",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -13064,8 +20170,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-867",
-   "self_type" : "type-868",
+   "referenced_type" : "type-417",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13073,8 +20179,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> &",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> &",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-414",
+   "self_type" : "type-690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13082,13 +20188,31 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-904",
-   "self_type" : "type-923",
+   "referenced_type" : "type-455",
+   "self_type" : "type-479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const char &",
+   "name" : "const char &",
+   "referenced_type" : "type-42",
+   "self_type" : "type-2306",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const char *const &",
+   "name" : "const char *const &",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-5",
@@ -13098,10 +20222,19 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object &",
+   "name" : "const flat_binder_object &",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3582",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13109,227 +20242,332 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-441",
-   "self_type" : "type-992",
+   "referenced_type" : "type-568",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1065",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1122",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1198",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1303",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1373",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1505",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1545",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1612",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1643",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1682",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1843",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1898",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1958",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1836",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2030",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2076",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2126",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2348",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2451",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-202",
-   "self_type" : "type-204",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2521",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2644",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-237",
-   "self_type" : "type-245",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2684",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-310",
-   "self_type" : "type-312",
+   "referenced_type" : "type-271",
+   "self_type" : "type-273",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-419",
-   "self_type" : "type-422",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-558",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2782",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-624",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2821",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-750",
-   "self_type" : "type-752",
+   "referenced_type" : "type-2893",
+   "self_type" : "type-2896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-85",
-   "self_type" : "type-88",
+   "referenced_type" : "type-2980",
+   "self_type" : "type-2982",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-917",
-   "self_type" : "type-919",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3037",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-3093",
+   "self_type" : "type-3095",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3163",
+   "self_type" : "type-3165",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3209",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3258",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3412",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3789",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3859",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-469",
+   "self_type" : "type-471",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-566",
+   "self_type" : "type-569",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-655",
+   "self_type" : "type-657",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-67",
+   "self_type" : "type-69",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-703",
+   "self_type" : "type-706",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-781",
+   "self_type" : "type-783",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-810",
+   "self_type" : "type-818",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-875",
+   "self_type" : "type-877",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-960",
+   "self_type" : "type-963",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-671",
-   "self_type" : "type-673",
+   "referenced_type" : "type-182",
+   "self_type" : "type-184",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -13337,8 +20575,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-604",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13346,8 +20584,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-970",
-   "self_type" : "type-980",
+   "referenced_type" : "type-547",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13355,8 +20593,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-926",
-   "self_type" : "type-934",
+   "referenced_type" : "type-482",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13364,8 +20602,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1009",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1132",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13373,44 +20638,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1182",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1153",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1222",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1223",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13418,8 +20647,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13427,35 +20656,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1496",
+   "self_type" : "type-1546",
    "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1548",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1619",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-165",
-   "self_type" : "type-176",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13463,8 +20674,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1682",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1791",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13472,8 +20692,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1852",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13481,8 +20701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1908",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13490,8 +20710,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1969",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2",
+   "self_type" : "type-35",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -13499,8 +20746,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1941",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13508,17 +20755,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-89",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2012",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -13526,8 +20764,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13535,8 +20773,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2685",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13544,8 +20782,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-233",
+   "referenced_type" : "type-2721",
+   "self_type" : "type-2730",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2770",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -13553,8 +20800,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2930",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13562,8 +20809,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-572",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2989",
+   "self_type" : "type-2991",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13571,8 +20818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-633",
-   "self_type" : "type-635",
+   "referenced_type" : "type-3045",
+   "self_type" : "type-3047",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -13580,8 +20827,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-819",
-   "self_type" : "type-821",
+   "referenced_type" : "type-3104",
+   "self_type" : "type-3106",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3180",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3221",
+   "self_type" : "type-3223",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-358",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13589,17 +20863,89 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-933",
+   "referenced_type" : "type-3730",
+   "self_type" : "type-3732",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3800",
+   "self_type" : "type-3802",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3877",
+   "self_type" : "type-3879",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-487",
+   "self_type" : "type-489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-52",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-598",
+   "self_type" : "type-600",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-648",
+   "self_type" : "type-707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-751",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-804",
+   "self_type" : "type-806",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13607,8 +20953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13616,8 +20962,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
    "name" : "const std::function<sp<IBase> (void *)> &",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-3872",
+   "self_type" : "type-3871",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)> &",
+   "name" : "const std::function<sp<IBase> (void *)> &",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13625,8 +20980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13634,8 +20989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13643,8 +20998,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
    "name" : "const std::function<sp<IBinder> (void *)> &",
-   "referenced_type" : "type-814",
-   "self_type" : "type-813",
+   "referenced_type" : "type-353",
+   "self_type" : "type-352",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)> &",
+   "name" : "const std::function<sp<IBinder> (void *)> &",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -13652,8 +21016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13661,8 +21025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2120",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -13670,17 +21034,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<void ()> &",
    "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-732",
-   "self_type" : "type-734",
+   "referenced_type" : "type-246",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3252",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::function<void ()> &",
+   "name" : "const std::function<void ()> &",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3454",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
+   "referenced_type" : "type-3577",
+   "self_type" : "type-3579",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1620",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13688,8 +21079,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
    "name" : "const std::vector<int, std::allocator<int> > &",
-   "referenced_type" : "type-211",
-   "self_type" : "type-214",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2759",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> > &",
+   "name" : "const std::vector<int, std::allocator<int> > &",
+   "referenced_type" : "type-788",
+   "self_type" : "type-791",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13697,8 +21097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13706,8 +21106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13715,8 +21115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13724,8 +21124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13733,8 +21133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13742,8 +21142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13751,8 +21151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13760,8 +21160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1300",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13769,8 +21169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1551",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13778,44 +21178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1359",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1449",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1487",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13832,8 +21196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1663",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13841,8 +21205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13850,8 +21214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1761",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13859,8 +21223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1820",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13868,8 +21232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13877,8 +21241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1885",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13895,8 +21259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2033",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13904,8 +21268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13913,8 +21277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13922,8 +21286,161 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2548",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2664",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2690",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2719",
+   "self_type" : "type-2718",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2802",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2836",
+   "self_type" : "type-2835",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2960",
+   "self_type" : "type-2959",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3008",
+   "self_type" : "type-3007",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3025",
+   "self_type" : "type-3024",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3130",
+   "self_type" : "type-3129",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3244",
+   "self_type" : "type-3243",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3263",
+   "self_type" : "type-3262",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13940,8 +21457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
+   "referenced_type" : "type-3716",
+   "self_type" : "type-3715",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13949,8 +21466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-518",
-   "self_type" : "type-517",
+   "referenced_type" : "type-3824",
+   "self_type" : "type-3823",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13958,8 +21475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-3887",
+   "self_type" : "type-3886",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13967,8 +21484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-60",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13976,8 +21493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-613",
-   "self_type" : "type-612",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13985,8 +21502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
+   "referenced_type" : "type-609",
+   "self_type" : "type-608",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13994,8 +21511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-804",
-   "self_type" : "type-803",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14003,8 +21520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
+   "referenced_type" : "type-713",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14012,8 +21529,44 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-892",
+   "self_type" : "type-891",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-91",
+   "self_type" : "type-90",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14021,26 +21574,44 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-454",
-   "self_type" : "type-965",
+   "referenced_type" : "type-522",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned char *const &",
+   "name" : "const unsigned char *const &",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3539",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-677",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-189",
+   "self_type" : "type-595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *const &",
+   "name" : "const unsigned int *const &",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3542",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-1021",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-611",
+   "self_type" : "type-613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14048,8 +21619,17 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-981",
-   "self_type" : "type-985",
+   "referenced_type" : "type-561",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const void *const &",
+   "name" : "const void *const &",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14057,8 +21637,8 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-760",
+   "referenced_type" : "type-14",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -14066,17 +21646,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1154",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14084,8 +21655,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1603",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14093,8 +21664,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14102,8 +21673,26 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-203",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14111,19 +21700,91 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-3159",
+   "self_type" : "type-3158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3364",
+   "self_type" : "type-3363",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3613",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-775",
+   "self_type" : "type-774",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-945",
+   "referenced_type" : "type-146",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *const &",
+   "name" : "void *const &",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3481",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
   }
  ],
  "pointer_types" :
@@ -14132,8 +21793,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CallStack *",
    "name" : "android::CallStack *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-686",
+   "referenced_type" : "type-197",
+   "self_type" : "type-198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14141,8 +21802,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CallStack::StackDeleter *",
    "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-690",
+   "referenced_type" : "type-201",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
@@ -14150,17 +21811,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-846",
-   "self_type" : "type-849",
+   "referenced_type" : "type-395",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3346",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3657",
+   "self_type" : "type-3656",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-839",
-   "self_type" : "type-842",
+   "referenced_type" : "type-388",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14168,8 +21901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-845",
+   "referenced_type" : "type-392",
+   "self_type" : "type-394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14177,8 +21910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-853",
+   "referenced_type" : "type-399",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14186,8 +21919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-403",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14195,8 +21928,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-859",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14204,8 +21937,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-24",
-   "self_type" : "type-66",
+   "referenced_type" : "type-18",
+   "self_type" : "type-25",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase **",
+   "name" : "android::RefBase **",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *const *",
+   "name" : "android::RefBase *const *",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1060",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14213,8 +21973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14222,8 +21982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1158",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14231,8 +21991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14240,8 +22000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14249,8 +22009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14258,8 +22018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14267,8 +22027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14276,8 +22036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14285,8 +22045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14294,8 +22054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14303,8 +22063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14312,8 +22072,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14321,8 +22081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14330,8 +22090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14339,8 +22099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14348,8 +22108,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-21",
+   "self_type" : "type-20",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14357,8 +22117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14366,8 +22126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14375,8 +22135,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1994",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14384,8 +22144,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2064",
-   "self_type" : "type-2063",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14393,8 +22153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-26",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14402,8 +22162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14411,8 +22171,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-416",
-   "self_type" : "type-415",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14420,8 +22180,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14429,8 +22189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14438,8 +22198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-747",
-   "self_type" : "type-746",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14447,8 +22207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14456,8 +22216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-81",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14465,8 +22225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-912",
-   "self_type" : "type-911",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14474,8 +22234,242 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3033",
+   "self_type" : "type-3032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3091",
+   "self_type" : "type-3090",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3428",
+   "self_type" : "type-3427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3784",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3854",
+   "self_type" : "type-3853",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-652",
+   "self_type" : "type-651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-700",
+   "self_type" : "type-699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-778",
+   "self_type" : "type-777",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14483,17 +22477,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-22",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type **",
+   "name" : "android::RefBase::weakref_type **",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *const *",
+   "name" : "android::RefBase::weakref_type *const *",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-23",
+   "referenced_type" : "type-7",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14501,17 +22513,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-501",
-   "self_type" : "type-502",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-3635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2219",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-763",
-   "self_type" : "type-774",
+   "referenced_type" : "type-286",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14519,8 +22549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-654",
-   "self_type" : "type-660",
+   "referenced_type" : "type-165",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14528,17 +22558,125 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase *> *",
+   "name" : "android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3435",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Vector<android::String8> *",
    "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-682",
+   "referenced_type" : "type-193",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-379",
+   "self_type" : "type-3431",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3456",
+   "self_type" : "type-3455",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-377",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2331",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14546,8 +22684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-509",
+   "referenced_type" : "type-126",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -14555,6 +22693,24 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1043",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
    "referenced_type" : "type-1227",
    "self_type" : "type-1226",
    "size" : 4,
@@ -14564,8 +22720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14573,8 +22729,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1714",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2709",
+   "self_type" : "type-2708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14582,8 +22819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-2842",
+   "self_type" : "type-2841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14591,8 +22828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-2854",
+   "self_type" : "type-2853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14600,8 +22837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-2963",
+   "self_type" : "type-2962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14609,8 +22846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14618,8 +22855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-3067",
+   "self_type" : "type-3066",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14627,8 +22864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14636,8 +22873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-3196",
+   "self_type" : "type-3195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14645,8 +22882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1922",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14654,8 +22891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-343",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14663,8 +22900,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-364",
+   "referenced_type" : "type-737",
+   "self_type" : "type-736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14672,35 +22918,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-526",
-   "self_type" : "type-525",
+   "referenced_type" : "type-915",
+   "self_type" : "type-914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-602",
-   "self_type" : "type-601",
+   "linker_set_key" : "android::hardware::BHwBinder **",
+   "name" : "android::hardware::BHwBinder **",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-3411",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "linker_set_key" : "android::hardware::BHwBinder *const *",
+   "name" : "android::hardware::BHwBinder *const *",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3416",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
+   "name" : "android::hardware::BHwBinder::Extras *",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder *",
+   "name" : "android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
+   "name" : "android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2236",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BpHwRefBase *",
+   "name" : "android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2181",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput *",
+   "name" : "android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2317",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
+   "name" : "android::hardware::BufferedTextOutput::BufferState *",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-30",
-   "self_type" : "type-39",
+   "referenced_type" : "type-664",
+   "self_type" : "type-667",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14708,8 +23062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-46",
+   "referenced_type" : "type-670",
+   "self_type" : "type-673",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14717,8 +23071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-792",
-   "self_type" : "type-806",
+   "referenced_type" : "type-326",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14726,8 +23080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-587",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14735,8 +23089,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-825",
+   "referenced_type" : "type-347",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -14744,17 +23098,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::HexDump *",
+   "name" : "android::hardware::HexDump *",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::HidlMemory *",
    "name" : "android::hardware::HidlMemory *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-348",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14762,8 +23125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1025",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14771,8 +23134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,8 +23143,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1269",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14789,8 +23152,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14798,8 +23161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14807,8 +23170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14816,8 +23179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14825,8 +23188,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14834,8 +23197,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14843,8 +23206,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14852,8 +23215,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14861,8 +23224,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1933",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14870,8 +23233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14879,8 +23242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14888,8 +23251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14897,8 +23260,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14906,8 +23269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14915,8 +23278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14924,8 +23287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-345",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14933,8 +23296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14942,8 +23305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-532",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14951,8 +23314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2844",
+   "self_type" : "type-2843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14960,8 +23323,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14969,8 +23332,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-74",
-   "self_type" : "type-73",
+   "referenced_type" : "type-2966",
+   "self_type" : "type-2965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14978,8 +23341,134 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3143",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3199",
+   "self_type" : "type-3198",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3828",
+   "self_type" : "type-3827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-385",
+   "self_type" : "type-384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-615",
+   "self_type" : "type-614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-693",
+   "self_type" : "type-692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14987,8 +23476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14996,8 +23485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15005,8 +23494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15014,8 +23503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15023,8 +23512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1873",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15032,8 +23521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15041,8 +23530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15050,8 +23539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15059,8 +23548,71 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
    "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-600",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2192",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2846",
+   "self_type" : "type-2845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3011",
+   "self_type" : "type-3010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3013",
+   "self_type" : "type-3012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3133",
+   "self_type" : "type-3132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3248",
+   "self_type" : "type-3247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
+   "name" : "android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-903",
+   "self_type" : "type-902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15068,8 +23620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15077,8 +23629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15086,8 +23638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1725",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15095,8 +23647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15104,8 +23656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15113,8 +23665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1936",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15122,8 +23674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2010",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15131,8 +23683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15140,17 +23692,89 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IInterface *",
    "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-3407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2967",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3021",
+   "self_type" : "type-3020",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3075",
+   "self_type" : "type-3074",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3147",
+   "self_type" : "type-3146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IInterface *",
+   "name" : "android::hardware::IInterface *",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IPCThreadState *",
+   "name" : "android::hardware::IPCThreadState *",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-3448",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::LazyServiceRegistrar *",
    "name" : "android::hardware::LazyServiceRegistrar *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-930",
+   "referenced_type" : "type-484",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -15158,8 +23782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15167,17 +23791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1544",
-   "size" : 4,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15185,8 +23800,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15194,8 +23809,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1922",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15203,8 +23854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15212,8 +23863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15221,8 +23872,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15230,8 +23890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2926",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15239,8 +23899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
+   "referenced_type" : "type-3006",
+   "self_type" : "type-3005",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15248,8 +23908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15257,8 +23917,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3176",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3228",
+   "self_type" : "type-3227",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15266,8 +23962,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-119",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15275,8 +23971,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::PassthroughServiceManager *",
    "name" : "android::hardware::PassthroughServiceManager *",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-2699",
+   "self_type" : "type-2698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PassthroughServiceManager *",
+   "name" : "android::hardware::PassthroughServiceManager *",
+   "referenced_type" : "type-722",
+   "self_type" : "type-721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::PoolThread *",
+   "name" : "android::hardware::PoolThread *",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15284,8 +23998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15293,8 +24007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15302,8 +24016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15311,8 +24025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15320,8 +24034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15329,8 +24043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15338,8 +24052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15347,8 +24061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15356,8 +24070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15365,8 +24079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15374,8 +24088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-388",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15383,8 +24097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-536",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15392,8 +24106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2809",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15401,17 +24115,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2970",
+   "self_type" : "type-2969",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3022",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3077",
+   "self_type" : "type-3076",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3149",
+   "self_type" : "type-3148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3203",
+   "self_type" : "type-3202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-446",
+   "self_type" : "type-445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
+   "name" : "android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3619",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-183",
+   "referenced_type" : "type-765",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15419,8 +24223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-174",
+   "referenced_type" : "type-758",
+   "self_type" : "type-759",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15428,8 +24232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-945",
+   "self_type" : "type-946",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15437,8 +24241,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1055",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15446,8 +24250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15455,8 +24259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15464,8 +24268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15473,8 +24277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-736",
+   "referenced_type" : "type-249",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15482,8 +24286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-488",
+   "referenced_type" : "type-120",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15491,17 +24295,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-407",
+   "referenced_type" : "type-103",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2292",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput *",
+   "name" : "android::hardware::TextOutput *",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-3708",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
+   "name" : "android::hardware::TextOutput::Bundle *",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TypeCode *",
+   "name" : "android::hardware::TypeCode *",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2294",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-1273",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15509,8 +24349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15518,8 +24358,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
    "name" : "android::hardware::details::ClientCounterCallback *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-972",
+   "referenced_type" : "type-3846",
+   "self_type" : "type-3845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::ClientCounterCallback *",
+   "name" : "android::hardware::details::ClientCounterCallback *",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15527,8 +24376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> > *",
-   "referenced_type" : "type-47",
-   "self_type" : "type-51",
+   "referenced_type" : "type-674",
+   "self_type" : "type-677",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15536,8 +24385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> > *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-54",
+   "referenced_type" : "type-678",
+   "self_type" : "type-680",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15545,8 +24394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > > *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-823",
+   "referenced_type" : "type-361",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15554,8 +24403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > > *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-601",
+   "self_type" : "type-603",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15563,8 +24412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > > *",
-   "referenced_type" : "type-824",
-   "self_type" : "type-826",
+   "referenced_type" : "type-364",
+   "self_type" : "type-366",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -15572,8 +24421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-135",
-   "self_type" : "type-998",
+   "referenced_type" : "type-128",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15581,8 +24430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::TaskRunner *",
    "name" : "android::hardware::details::TaskRunner *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-726",
+   "referenced_type" : "type-208",
+   "self_type" : "type-240",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -15590,8 +24439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-1381",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15599,8 +24448,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::Waiter *",
    "name" : "android::hardware::details::Waiter *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-149",
+   "referenced_type" : "type-2712",
+   "self_type" : "type-2711",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::Waiter *",
+   "name" : "android::hardware::details::Waiter *",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15608,8 +24466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-511",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1035",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15617,8 +24475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-507",
+   "referenced_type" : "type-571",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15626,8 +24484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-235",
+   "referenced_type" : "type-793",
+   "self_type" : "type-808",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15635,8 +24493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> *",
    "name" : "android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-314",
+   "referenced_type" : "type-39",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15644,8 +24502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-12",
-   "self_type" : "type-936",
+   "referenced_type" : "type-9",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15653,8 +24511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int> *",
    "name" : "android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-473",
+   "self_type" : "type-776",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15662,8 +24520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-442",
+   "referenced_type" : "type-112",
+   "self_type" : "type-113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15671,8 +24529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15680,8 +24538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient *",
    "name" : "android::hardware::hidl_binder_death_recipient *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-357",
+   "referenced_type" : "type-306",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -15689,8 +24547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-83",
+   "self_type" : "type-82",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15698,8 +24556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-78",
+   "referenced_type" : "type-28",
+   "self_type" : "type-30",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15707,8 +24565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-201",
-   "self_type" : "type-213",
+   "referenced_type" : "type-60",
+   "self_type" : "type-61",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15716,8 +24574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string *",
    "name" : "android::hardware::hidl_string *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-122",
+   "referenced_type" : "type-38",
+   "self_type" : "type-45",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15725,8 +24583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-430",
-   "self_type" : "type-436",
+   "referenced_type" : "type-968",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15734,8 +24592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-570",
+   "self_type" : "type-964",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15743,8 +24601,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-221",
+   "referenced_type" : "type-792",
+   "self_type" : "type-796",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15752,8 +24610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-990",
-   "self_type" : "type-993",
+   "referenced_type" : "type-575",
+   "self_type" : "type-578",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15761,8 +24619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> *",
    "name" : "android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-206",
-   "self_type" : "type-205",
+   "referenced_type" : "type-472",
+   "self_type" : "type-784",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15770,8 +24628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-265",
+   "referenced_type" : "type-70",
+   "self_type" : "type-72",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15779,8 +24637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase *",
    "name" : "android::hidl::base::V1_0::BnHwBase *",
-   "referenced_type" : "type-229",
-   "self_type" : "type-776",
+   "referenced_type" : "type-299",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -15788,8 +24646,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase *",
    "name" : "android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-372",
+   "referenced_type" : "type-368",
+   "self_type" : "type-920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15797,8 +24655,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::BsBase *",
    "name" : "android::hidl::base::V1_0::BsBase *",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15806,8 +24664,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-35",
-   "self_type" : "type-34",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15815,8 +24673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-260",
+   "referenced_type" : "type-828",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h"
   },
@@ -15824,8 +24682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification *",
-   "referenced_type" : "type-247",
-   "self_type" : "type-248",
+   "referenced_type" : "type-820",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -15833,8 +24691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-371",
+   "referenced_type" : "type-830",
+   "self_type" : "type-919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15842,8 +24700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-394",
+   "referenced_type" : "type-822",
+   "self_type" : "type-938",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15851,8 +24709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager *",
    "name" : "android::hidl::manager::V1_0::BsServiceManager *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-370",
+   "referenced_type" : "type-917",
+   "self_type" : "type-918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15860,8 +24718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification *",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification *",
-   "referenced_type" : "type-528",
-   "self_type" : "type-529",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15869,8 +24727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager *",
    "name" : "android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-259",
+   "referenced_type" : "type-504",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15878,8 +24736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
+   "referenced_type" : "type-502",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15887,8 +24745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-147",
+   "referenced_type" : "type-495",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15896,8 +24754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-837",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -15905,8 +24763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-605",
+   "referenced_type" : "type-839",
+   "self_type" : "type-1101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15914,8 +24772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager *",
    "name" : "android::hidl::manager::V1_1::BsServiceManager *",
-   "referenced_type" : "type-603",
-   "self_type" : "type-604",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15923,8 +24781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager *",
    "name" : "android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15932,8 +24790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback *",
-   "referenced_type" : "type-277",
-   "self_type" : "type-278",
+   "referenced_type" : "type-846",
+   "self_type" : "type-847",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -15941,8 +24799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager *",
-   "referenced_type" : "type-228",
-   "self_type" : "type-285",
+   "referenced_type" : "type-803",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h"
   },
@@ -15950,8 +24808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-279",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-848",
+   "self_type" : "type-1931",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15959,8 +24817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-139",
+   "referenced_type" : "type-729",
+   "self_type" : "type-733",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15968,8 +24826,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback *",
    "name" : "android::hidl::manager::V1_2::BsClientCallback *",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15977,8 +24835,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager *",
    "name" : "android::hidl::manager::V1_2::BsServiceManager *",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1772",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15986,8 +24844,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback *",
    "name" : "android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-156",
-   "self_type" : "type-155",
+   "referenced_type" : "type-498",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15995,8 +24853,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager *",
    "name" : "android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
+   "referenced_type" : "type-517",
+   "self_type" : "type-538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Thread> *",
+   "name" : "android::sp<android::Thread> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-3632",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16004,17 +24889,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
    "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-875",
-   "self_type" : "type-905",
+   "referenced_type" : "type-425",
+   "self_type" : "type-456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> *",
    "name" : "android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-366",
+   "referenced_type" : "type-93",
+   "self_type" : "type-98",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16022,8 +24916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-380",
+   "referenced_type" : "type-922",
+   "self_type" : "type-924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16031,8 +24925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> *",
    "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-885",
+   "referenced_type" : "type-383",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16040,8 +24934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager> *",
    "name" : "android::sp<android::hardware::PassthroughServiceManager> *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-157",
+   "referenced_type" : "type-720",
+   "self_type" : "type-743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16049,8 +24943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
    "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-893",
-   "self_type" : "type-897",
+   "referenced_type" : "type-444",
+   "self_type" : "type-448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16058,8 +24952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-977",
+   "referenced_type" : "type-555",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16067,8 +24961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::details::Waiter> *",
    "name" : "android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16076,8 +24970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-397",
+   "referenced_type" : "type-908",
+   "self_type" : "type-941",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16085,8 +24979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-304",
-   "self_type" : "type-878",
+   "referenced_type" : "type-81",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16094,8 +24988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-173",
-   "self_type" : "type-883",
+   "referenced_type" : "type-300",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16103,8 +24997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-961",
+   "referenced_type" : "type-526",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16112,8 +25006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-968",
+   "referenced_type" : "type-542",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16121,8 +25015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-963",
+   "referenced_type" : "type-531",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16130,8 +25024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-971",
+   "referenced_type" : "type-548",
+   "self_type" : "type-550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16139,8 +25033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-127",
-   "self_type" : "type-966",
+   "referenced_type" : "type-537",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16148,8 +25042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> *",
    "name" : "android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-797",
-   "self_type" : "type-871",
+   "referenced_type" : "type-331",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16157,8 +25051,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-354",
+   "referenced_type" : "type-901",
+   "self_type" : "type-906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
+   "name" : "android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16166,8 +25069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-866",
+   "referenced_type" : "type-307",
+   "self_type" : "type-416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16175,8 +25078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-33",
-   "self_type" : "type-857",
+   "referenced_type" : "type-309",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16184,17 +25087,35 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-719",
+   "referenced_type" : "type-229",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2243",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-29",
+   "self_type" : "type-3590",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-49",
-   "self_type" : "type-450",
+   "referenced_type" : "type-43",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16202,17 +25123,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CallStack *",
    "name" : "const android::CallStack *",
-   "referenced_type" : "type-687",
-   "self_type" : "type-688",
+   "referenced_type" : "type-199",
+   "self_type" : "type-200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2231",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-755",
-   "self_type" : "type-756",
+   "referenced_type" : "type-277",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -16220,17 +25159,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-63",
+   "referenced_type" : "type-23",
+   "self_type" : "type-24",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-771",
+   "referenced_type" : "type-293",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16238,17 +25195,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-656",
-   "self_type" : "type-657",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase *> *",
+   "name" : "const android::Vector<android::RefBase *> *",
+   "referenced_type" : "type-3440",
+   "self_type" : "type-3441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
+   "referenced_type" : "type-3436",
+   "self_type" : "type-3437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::String8> *",
    "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-683",
-   "self_type" : "type-684",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
+   "referenced_type" : "type-3432",
+   "self_type" : "type-3433",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
+   "referenced_type" : "type-3640",
+   "self_type" : "type-3641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2333",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16256,17 +25276,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-679",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BHwBinder *",
+   "name" : "const android::hardware::BHwBinder *",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2174",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder *",
+   "name" : "const android::hardware::BpHwBinder *",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2185",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
+   "name" : "const android::hardware::BpHwBinder::Obituary *",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2204",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2238",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2183",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
+   "name" : "const android::hardware::BufferedTextOutput *",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2321",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-486",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16274,8 +25348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-489",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1016",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16283,8 +25357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > *",
-   "referenced_type" : "type-809",
-   "self_type" : "type-810",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16292,8 +25366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-596",
+   "self_type" : "type-597",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -16301,17 +25375,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > *",
-   "referenced_type" : "type-816",
-   "self_type" : "type-818",
+   "referenced_type" : "type-355",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::HexDump *",
+   "name" : "const android::hardware::HexDump *",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16319,8 +25402,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2143",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16328,17 +25420,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::IBinder *",
    "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-890",
-   "self_type" : "type-892",
+   "referenced_type" : "type-3774",
+   "self_type" : "type-3776",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder *",
+   "name" : "const android::hardware::IBinder *",
+   "referenced_type" : "type-441",
+   "self_type" : "type-443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
+   "name" : "const android::hardware::IBinder::DeathRecipient *",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IInterface *",
+   "name" : "const android::hardware::IInterface *",
+   "referenced_type" : "type-3409",
+   "self_type" : "type-3410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::IPCThreadState *",
+   "name" : "const android::hardware::IPCThreadState *",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3451",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Parcel *",
+   "name" : "const android::hardware::Parcel *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-3576",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState *",
+   "name" : "const android::hardware::ProcessState *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
+   "name" : "const android::hardware::ProcessState::handle_entry *",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-187",
+   "referenced_type" : "type-769",
+   "self_type" : "type-770",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16346,8 +25501,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-179",
+   "referenced_type" : "type-763",
+   "self_type" : "type-764",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16355,8 +25510,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > *",
-   "referenced_type" : "type-406",
-   "self_type" : "type-408",
+   "referenced_type" : "type-949",
+   "self_type" : "type-951",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16364,8 +25519,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-548",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1059",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16373,8 +25528,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > *",
-   "referenced_type" : "type-619",
-   "self_type" : "type-620",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16382,8 +25537,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1951",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16391,8 +25546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > *",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16400,8 +25555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-908",
+   "referenced_type" : "type-459",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16409,17 +25564,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-412",
-   "self_type" : "type-421",
+   "referenced_type" : "type-107",
+   "self_type" : "type-111",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::TypeCode *",
+   "name" : "const android::hardware::TypeCode *",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2296",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-1389",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16427,8 +25591,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::Waiter *",
    "name" : "const android::hardware::details::Waiter *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-171",
+   "referenced_type" : "type-2725",
+   "self_type" : "type-2727",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::details::Waiter *",
+   "name" : "const android::hardware::details::Waiter *",
+   "referenced_type" : "type-755",
+   "self_type" : "type-757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16436,8 +25609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-515",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1038",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16445,8 +25618,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string> *",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-606",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16454,8 +25627,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-239",
-   "self_type" : "type-240",
+   "referenced_type" : "type-812",
+   "self_type" : "type-813",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16463,8 +25636,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char> *",
    "name" : "const android::hardware::details::hidl_pointer<const char> *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-332",
+   "referenced_type" : "type-88",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16472,8 +25645,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-130",
+   "referenced_type" : "type-8",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16481,8 +25654,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int> *",
    "name" : "const android::hardware::details::hidl_pointer<int> *",
-   "referenced_type" : "type-210",
-   "self_type" : "type-935",
+   "referenced_type" : "type-491",
+   "self_type" : "type-492",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16490,8 +25663,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-455",
-   "self_type" : "type-469",
+   "referenced_type" : "type-115",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16499,8 +25672,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32> *",
    "name" : "const android::hardware::hidl_array<unsigned char, 32> *",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16508,8 +25681,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_death_recipient *",
    "name" : "const android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-881",
-   "self_type" : "type-882",
+   "referenced_type" : "type-431",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16517,8 +25690,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle *",
    "name" : "const android::hardware::hidl_handle *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-93",
+   "referenced_type" : "type-31",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16526,8 +25699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-222",
-   "self_type" : "type-234",
+   "referenced_type" : "type-62",
+   "self_type" : "type-66",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16535,8 +25708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string *",
    "name" : "const android::hardware::hidl_string *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-189",
+   "referenced_type" : "type-47",
+   "self_type" : "type-56",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16544,8 +25717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> > *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2085",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16553,8 +25726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string> *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-989",
+   "referenced_type" : "type-573",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16562,8 +25735,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo> *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-446",
+   "referenced_type" : "type-982",
+   "self_type" : "type-983",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16571,8 +25744,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true> *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-996",
+   "referenced_type" : "type-580",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16580,8 +25753,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<int> *",
    "name" : "const android::hardware::hidl_vec<int> *",
-   "referenced_type" : "type-920",
-   "self_type" : "type-921",
+   "referenced_type" : "type-476",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16589,8 +25762,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-276",
-   "self_type" : "type-287",
+   "referenced_type" : "type-73",
+   "self_type" : "type-74",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16598,8 +25771,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase *",
    "name" : "const android::hidl::base::V1_0::BpHwBase *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-372",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -16607,8 +25780,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-330",
+   "self_type" : "type-329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16616,8 +25789,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager *",
-   "referenced_type" : "type-266",
-   "self_type" : "type-267",
+   "referenced_type" : "type-835",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -16625,8 +25798,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-256",
+   "referenced_type" : "type-826",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -16634,8 +25807,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager *",
-   "referenced_type" : "type-942",
-   "self_type" : "type-943",
+   "referenced_type" : "type-503",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -16643,8 +25816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-981",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16652,8 +25825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-937",
-   "self_type" : "type-938",
+   "referenced_type" : "type-494",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16661,8 +25834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-275",
+   "referenced_type" : "type-843",
+   "self_type" : "type-844",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -16670,8 +25843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager *",
    "name" : "const android::hidl::manager::V1_1::IServiceManager *",
-   "referenced_type" : "type-951",
-   "self_type" : "type-952",
+   "referenced_type" : "type-513",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -16679,8 +25852,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-284",
+   "referenced_type" : "type-852",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -16688,8 +25861,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-288",
+   "referenced_type" : "type-855",
+   "self_type" : "type-857",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -16697,8 +25870,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback *",
    "name" : "const android::hidl::manager::V1_2::IClientCallback *",
-   "referenced_type" : "type-939",
-   "self_type" : "type-940",
+   "referenced_type" : "type-497",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -16706,17 +25879,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager *",
    "name" : "const android::hidl::manager::V1_2::IServiceManager *",
-   "referenced_type" : "type-953",
-   "self_type" : "type-954",
+   "referenced_type" : "type-516",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::Thread> *",
+   "name" : "const android::sp<android::Thread> *",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
+   "name" : "const android::sp<android::hardware::BHwBinder> *",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::HidlMemory> *",
    "name" : "const android::sp<android::hardware::HidlMemory> *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-390",
+   "referenced_type" : "type-100",
+   "self_type" : "type-101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16724,8 +25951,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
    "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-71",
-   "self_type" : "type-889",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
+   "name" : "const android::sp<android::hardware::IInterface> *",
+   "referenced_type" : "type-3406",
+   "self_type" : "type-3408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16733,8 +25969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
    "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-898",
-   "self_type" : "type-899",
+   "referenced_type" : "type-449",
+   "self_type" : "type-450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16742,8 +25978,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback> *",
-   "referenced_type" : "type-978",
-   "self_type" : "type-979",
+   "referenced_type" : "type-558",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16751,8 +25987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter> *",
    "name" : "const android::sp<android::hardware::details::Waiter> *",
-   "referenced_type" : "type-167",
-   "self_type" : "type-168",
+   "referenced_type" : "type-753",
+   "self_type" : "type-754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16760,8 +25996,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-400",
+   "referenced_type" : "type-907",
+   "self_type" : "type-944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16769,8 +26005,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-303",
-   "self_type" : "type-393",
+   "referenced_type" : "type-80",
+   "self_type" : "type-102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16778,8 +26014,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-861",
-   "self_type" : "type-884",
+   "referenced_type" : "type-410",
+   "self_type" : "type-434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16787,8 +26023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager> *",
-   "referenced_type" : "type-299",
-   "self_type" : "type-962",
+   "referenced_type" : "type-529",
+   "self_type" : "type-530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16796,8 +26032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-969",
+   "referenced_type" : "type-545",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16805,8 +26041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-964",
+   "referenced_type" : "type-534",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16814,8 +26050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-974",
+   "referenced_type" : "type-553",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16823,8 +26059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-967",
+   "referenced_type" : "type-540",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16832,8 +26068,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder> *",
    "name" : "const android::wp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-877",
+   "referenced_type" : "type-422",
+   "self_type" : "type-427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
+   "name" : "const android::wp<android::hardware::IBinder> *",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16841,8 +26095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::wp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-867",
-   "self_type" : "type-869",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16850,17 +26104,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-865",
+   "referenced_type" : "type-414",
+   "self_type" : "type-415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const binder_buffer_object *",
+   "name" : "const binder_buffer_object *",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-100",
+   "referenced_type" : "type-42",
+   "self_type" : "type-41",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16868,8 +26131,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-288",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16877,8 +26140,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-116",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16886,8 +26149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16895,17 +26158,35 @@
    "alignment" : 4,
    "linker_set_key" : "const dirent *",
    "name" : "const dirent *",
-   "referenced_type" : "type-467",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2971",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const dirent *",
+   "name" : "const dirent *",
+   "referenced_type" : "type-996",
+   "self_type" : "type-1053",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const flat_binder_object *",
+   "name" : "const flat_binder_object *",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3593",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-568",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16913,8 +26194,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-671",
-   "self_type" : "type-672",
+   "referenced_type" : "type-182",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16922,35 +26203,89 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const native_handle **",
+   "name" : "const native_handle **",
+   "referenced_type" : "type-11",
+   "self_type" : "type-3595",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-522",
+   "self_type" : "type-990",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const unsigned int *",
+   "name" : "const unsigned int *",
+   "referenced_type" : "type-189",
+   "self_type" : "type-3541",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const unsigned long long *",
+   "name" : "const unsigned long long *",
+   "referenced_type" : "type-611",
+   "self_type" : "type-2165",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-300",
+   "referenced_type" : "type-76",
+   "self_type" : "type-78",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const void **",
+   "name" : "const void **",
+   "referenced_type" : "type-78",
+   "self_type" : "type-3594",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "double *",
+   "name" : "double *",
+   "referenced_type" : "type-6",
+   "self_type" : "type-3589",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "float *",
+   "name" : "float *",
+   "referenced_type" : "type-237",
+   "self_type" : "type-3588",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-728",
-   "self_type" : "type-729",
+   "referenced_type" : "type-242",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16958,8 +26293,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-196",
+   "referenced_type" : "type-14",
+   "self_type" : "type-475",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16967,26 +26302,71 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-668",
-   "self_type" : "type-674",
+   "referenced_type" : "type-179",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long *",
+   "name" : "long long *",
+   "referenced_type" : "type-336",
+   "self_type" : "type-3587",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-90",
+   "referenced_type" : "type-13",
+   "self_type" : "type-36",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "short *",
+   "name" : "short *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-3584",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-3583",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2305",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1710",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16994,8 +26374,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2850",
+   "self_type" : "type-2849",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17003,8 +26383,17 @@
    "alignment" : 4,
    "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
    "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-361",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "name" : "std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > *",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17012,8 +26401,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-716",
+   "referenced_type" : "type-146",
+   "self_type" : "type-230",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -17021,17 +26410,62 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-102",
-   "self_type" : "type-474",
+   "referenced_type" : "type-44",
+   "self_type" : "type-1002",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "unsigned long long *",
+   "name" : "unsigned long long *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short *",
+   "name" : "unsigned short *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-3585",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(const void *, void *, void *)",
+   "name" : "void (*)(const void *, void *, void *)",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void (*)(void *, const char *)",
+   "name" : "void (*)(void *, const char *)",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3398",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-108",
-   "self_type" : "type-676",
+   "referenced_type" : "type-77",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17039,8 +26473,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-676",
-   "self_type" : "type-731",
+   "referenced_type" : "type-188",
+   "self_type" : "type-245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -17050,10 +26484,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase *const",
+   "name" : "android::RefBase *const",
+   "referenced_type" : "type-25",
+   "self_type" : "type-3419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1146",
-   "self_type" : "type-1149",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1062",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17062,8 +26506,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17072,8 +26516,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17082,8 +26526,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17092,8 +26536,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17102,8 +26546,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17112,8 +26556,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17122,8 +26566,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17132,8 +26576,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1608",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17142,8 +26586,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17152,8 +26596,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17162,8 +26606,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17172,8 +26616,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17182,8 +26626,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17192,8 +26636,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17202,8 +26646,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17212,8 +26656,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1879",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-20",
+   "self_type" : "type-19",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17222,8 +26666,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-197",
-   "self_type" : "type-199",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17232,8 +26676,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17242,8 +26686,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17252,8 +26696,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-26",
-   "self_type" : "type-25",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2312",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17262,8 +26706,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-307",
-   "self_type" : "type-309",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17272,8 +26716,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17282,8 +26726,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-552",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2515",
+   "self_type" : "type-2517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17292,8 +26736,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17302,8 +26746,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-746",
-   "self_type" : "type-748",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17312,8 +26756,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7",
-   "self_type" : "type-9",
+   "referenced_type" : "type-265",
+   "self_type" : "type-267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17322,8 +26766,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-81",
-   "self_type" : "type-83",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17332,8 +26776,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-911",
-   "self_type" : "type-913",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17342,28 +26786,628 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-982",
-   "self_type" : "type-984",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2817",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2891",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2977",
+   "self_type" : "type-2979",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3321",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3391",
+   "self_type" : "type-3393",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3399",
+   "self_type" : "type-3402",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3427",
+   "self_type" : "type-3429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3566",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3692",
+   "self_type" : "type-3694",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-463",
+   "self_type" : "type-465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-562",
+   "self_type" : "type-564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-651",
+   "self_type" : "type-653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-699",
+   "self_type" : "type-701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-777",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-871",
+   "self_type" : "type-873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-956",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_type *const",
+   "name" : "android::RefBase::weakref_type *const",
+   "referenced_type" : "type-308",
+   "self_type" : "type-3417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::BHwBinder *const",
+   "name" : "android::hardware::BHwBinder *const",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-3415",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2178",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "char *const",
+   "name" : "char *const",
+   "referenced_type" : "type-186",
+   "self_type" : "type-3601",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[10]",
+   "name" : "char const[10]",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
+   "size" : 10,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[11]",
+   "name" : "char const[11]",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
+   "size" : 11,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[12]",
+   "name" : "char const[12]",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[13]",
+   "name" : "char const[13]",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 13,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[14]",
+   "name" : "char const[14]",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
+   "size" : 14,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[15]",
+   "name" : "char const[15]",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
+   "size" : 15,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[16]",
+   "name" : "char const[16]",
+   "referenced_type" : "type-362",
+   "self_type" : "type-3494",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[17]",
+   "name" : "char const[17]",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
+   "size" : 17,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[18]",
+   "name" : "char const[18]",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 18,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[19]",
+   "name" : "char const[19]",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3528",
+   "size" : 19,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[20]",
+   "name" : "char const[20]",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[22]",
+   "name" : "char const[22]",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 22,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[25]",
+   "name" : "char const[25]",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 25,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[28]",
+   "name" : "char const[28]",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[29]",
+   "name" : "char const[29]",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
+   "size" : 29,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[2]",
+   "name" : "char const[2]",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
+   "size" : 2,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[31]",
+   "name" : "char const[31]",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
+   "size" : 31,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[32]",
+   "name" : "char const[32]",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 32,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[35]",
+   "name" : "char const[35]",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 35,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[37]",
+   "name" : "char const[37]",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
+   "size" : 37,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[3]",
+   "name" : "char const[3]",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
+   "size" : 3,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[4]",
+   "name" : "char const[4]",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[5]",
+   "name" : "char const[5]",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3610",
+   "size" : 5,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[6]",
+   "name" : "char const[6]",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3473",
+   "size" : 6,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[7]",
+   "name" : "char const[7]",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
+   "size" : 7,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[8]",
+   "name" : "char const[8]",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "char const[9]",
+   "name" : "char const[9]",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
+   "size" : 9,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::CallStack",
    "name" : "const android::CallStack",
-   "referenced_type" : "type-685",
-   "self_type" : "type-687",
+   "referenced_type" : "type-197",
+   "self_type" : "type-199",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-382",
+   "self_type" : "type-3645",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2230",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-742",
-   "self_type" : "type-755",
+   "referenced_type" : "type-257",
+   "self_type" : "type-277",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -17372,18 +27416,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-24",
-   "self_type" : "type-55",
+   "referenced_type" : "type-18",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-375",
+   "self_type" : "type-3636",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2220",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-763",
-   "self_type" : "type-770",
+   "referenced_type" : "type-286",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17392,18 +27456,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-654",
-   "self_type" : "type-656",
+   "referenced_type" : "type-165",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase *>",
+   "name" : "const android::Vector<android::RefBase *>",
+   "referenced_type" : "type-381",
+   "self_type" : "type-3440",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
+   "name" : "const android::Vector<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-380",
+   "self_type" : "type-3436",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::String8>",
    "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-681",
-   "self_type" : "type-683",
+   "referenced_type" : "type-193",
+   "self_type" : "type-195",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
+   "name" : "const android::Vector<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-379",
+   "self_type" : "type-3432",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2225",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-377",
+   "self_type" : "type-3640",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2332",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<int>",
+   "name" : "const android::Vector<int>",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2325",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17412,18 +27546,88 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-675",
-   "self_type" : "type-678",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BHwBinder",
+   "name" : "const android::hardware::BHwBinder",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2173",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder",
+   "name" : "const android::hardware::BpHwBinder",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2184",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
+   "name" : "const android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2203",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2237",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2210",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2182",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::BufferedTextOutput",
+   "name" : "const android::hardware::BufferedTextOutput",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2320",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
-   "referenced_type" : "type-30",
-   "self_type" : "type-485",
+   "referenced_type" : "type-664",
+   "self_type" : "type-1012",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17432,8 +27636,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "const android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
-   "referenced_type" : "type-42",
-   "self_type" : "type-487",
+   "referenced_type" : "type-670",
+   "self_type" : "type-1014",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17442,8 +27646,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "const android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
-   "referenced_type" : "type-792",
-   "self_type" : "type-809",
+   "referenced_type" : "type-326",
+   "self_type" : "type-343",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17452,8 +27656,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-1006",
+   "referenced_type" : "type-587",
+   "self_type" : "type-596",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17462,18 +27666,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "const android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
-   "referenced_type" : "type-321",
-   "self_type" : "type-816",
+   "referenced_type" : "type-347",
+   "self_type" : "type-355",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::HexDump",
+   "name" : "const android::hardware::HexDump",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2300",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17482,8 +27696,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2142",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2436",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17492,18 +27716,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::IBinder",
    "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-891",
-   "self_type" : "type-890",
+   "referenced_type" : "type-3775",
+   "self_type" : "type-3774",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder",
+   "name" : "const android::hardware::IBinder",
+   "referenced_type" : "type-442",
+   "self_type" : "type-441",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
+   "name" : "const android::hardware::IBinder::DeathRecipient",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2232",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IInterface",
+   "name" : "const android::hardware::IInterface",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-3409",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::IPCThreadState",
+   "name" : "const android::hardware::IPCThreadState",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-3449",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17512,18 +27776,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1538",
-   "size" : 68,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1635",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17532,8 +27786,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17542,8 +27796,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1217",
+   "self_type" : "type-1216",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
   },
@@ -17552,8 +27846,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17562,8 +27856,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -17572,8 +27866,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2166",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17582,8 +27886,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2920",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -17592,8 +27896,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-3003",
+   "self_type" : "type-3002",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h"
   },
@@ -17602,8 +27906,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-3059",
+   "self_type" : "type-3058",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h"
   },
@@ -17612,18 +27916,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 68,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
+   "size" : 68,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3672",
+   "size" : 68,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState",
+   "name" : "const android::hardware::ProcessState",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-3658",
+   "size" : 120,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
+   "name" : "const android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-3621",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "const android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-186",
+   "referenced_type" : "type-765",
+   "self_type" : "type-769",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17632,8 +27996,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
-   "referenced_type" : "type-172",
-   "self_type" : "type-178",
+   "referenced_type" : "type-758",
+   "self_type" : "type-763",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17642,8 +28006,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-406",
+   "referenced_type" : "type-945",
+   "self_type" : "type-949",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17652,8 +28016,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
-   "referenced_type" : "type-542",
-   "self_type" : "type-546",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1058",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17662,8 +28026,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
-   "referenced_type" : "type-615",
-   "self_type" : "type-619",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1115",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17672,8 +28036,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1950",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17682,8 +28046,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "const android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2020",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17692,8 +28056,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-410",
+   "referenced_type" : "type-249",
+   "self_type" : "type-459",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17702,8 +28066,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<void>",
    "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
+   "referenced_type" : "type-120",
+   "self_type" : "type-715",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17712,18 +28076,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-106",
-   "self_type" : "type-412",
+   "referenced_type" : "type-103",
+   "self_type" : "type-107",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::TypeCode",
+   "name" : "const android::hardware::TypeCode",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2295",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::details::SchedPrio",
    "name" : "const android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-484",
+   "referenced_type" : "type-367",
+   "self_type" : "type-1011",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17732,8 +28106,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17742,8 +28116,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::Waiter",
    "name" : "const android::hardware::details::Waiter",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-2726",
+   "self_type" : "type-2725",
+   "size" : 52,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::details::Waiter",
+   "name" : "const android::hardware::details::Waiter",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17752,8 +28136,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-514",
+   "referenced_type" : "type-969",
+   "self_type" : "type-1037",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17762,8 +28146,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-571",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17772,8 +28156,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-239",
+   "referenced_type" : "type-793",
+   "self_type" : "type-812",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17782,8 +28166,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const char>",
    "name" : "const android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-319",
+   "referenced_type" : "type-39",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17792,8 +28176,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "const android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17802,8 +28186,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<int>",
    "name" : "const android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-210",
+   "referenced_type" : "type-473",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17812,8 +28196,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-105",
-   "self_type" : "type-455",
+   "referenced_type" : "type-112",
+   "self_type" : "type-115",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17822,8 +28206,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned char, 32>",
    "name" : "const android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-972",
+   "self_type" : "type-2083",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17832,8 +28216,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_death_recipient",
    "name" : "const android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-881",
+   "referenced_type" : "type-83",
+   "self_type" : "type-431",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17842,8 +28226,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-79",
+   "referenced_type" : "type-28",
+   "self_type" : "type-31",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17852,8 +28236,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-201",
-   "self_type" : "type-222",
+   "referenced_type" : "type-60",
+   "self_type" : "type-62",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17862,8 +28246,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-141",
+   "referenced_type" : "type-38",
+   "self_type" : "type-47",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17872,8 +28256,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-968",
+   "self_type" : "type-2084",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17882,8 +28266,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-476",
+   "referenced_type" : "type-570",
+   "self_type" : "type-573",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17892,8 +28276,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "const android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-445",
+   "referenced_type" : "type-792",
+   "self_type" : "type-982",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17902,8 +28286,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "const android::hardware::hidl_vec<hidl_string>::iter<true>",
-   "referenced_type" : "type-990",
-   "self_type" : "type-995",
+   "referenced_type" : "type-575",
+   "self_type" : "type-580",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17912,8 +28296,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<int>",
    "name" : "const android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-920",
+   "referenced_type" : "type-472",
+   "self_type" : "type-476",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17922,8 +28306,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-276",
+   "referenced_type" : "type-70",
+   "self_type" : "type-73",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17932,8 +28316,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::BpHwBase",
    "name" : "const android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-827",
+   "referenced_type" : "type-368",
+   "self_type" : "type-372",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h"
   },
@@ -17942,8 +28326,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-220",
-   "self_type" : "type-758",
+   "referenced_type" : "type-280",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17952,8 +28336,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-796",
+   "referenced_type" : "type-302",
+   "self_type" : "type-330",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17962,8 +28346,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *const",
    "name" : "const android::hidl::base::V1_0::IBase *const",
-   "referenced_type" : "type-795",
-   "self_type" : "type-811",
+   "referenced_type" : "type-329",
+   "self_type" : "type-345",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -17972,8 +28356,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-266",
+   "referenced_type" : "type-830",
+   "self_type" : "type-835",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h"
   },
@@ -17982,8 +28366,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "const android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-255",
+   "referenced_type" : "type-822",
+   "self_type" : "type-826",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h"
   },
@@ -17992,8 +28376,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager",
    "name" : "const android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-942",
+   "referenced_type" : "type-504",
+   "self_type" : "type-503",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18002,8 +28386,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-444",
+   "referenced_type" : "type-502",
+   "self_type" : "type-981",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18012,8 +28396,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::PidConstant",
-   "referenced_type" : "type-941",
-   "self_type" : "type-946",
+   "referenced_type" : "type-501",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18022,8 +28406,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
    "name" : "const android::hidl::manager::V1_0::IServiceManager::Transport",
-   "referenced_type" : "type-181",
-   "self_type" : "type-944",
+   "referenced_type" : "type-500",
+   "self_type" : "type-506",
    "size" : 1,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18032,8 +28416,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-937",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -18042,8 +28426,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-274",
+   "referenced_type" : "type-839",
+   "self_type" : "type-843",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h"
   },
@@ -18052,8 +28436,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_1::IServiceManager",
    "name" : "const android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-951",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h"
   },
@@ -18062,8 +28446,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "const android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-283",
+   "referenced_type" : "type-848",
+   "self_type" : "type-852",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h"
   },
@@ -18072,8 +28456,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "const android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-131",
-   "self_type" : "type-286",
+   "referenced_type" : "type-729",
+   "self_type" : "type-855",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h"
   },
@@ -18082,8 +28466,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IClientCallback",
    "name" : "const android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-939",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h"
   },
@@ -18092,28 +28476,138 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_2::IServiceManager",
    "name" : "const android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-953",
+   "referenced_type" : "type-517",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
-   "name" : "const android::sp<android::hardware::HidlMemory>",
-   "referenced_type" : "type-347",
-   "self_type" : "type-383",
+   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::Thread>",
+   "name" : "const android::sp<android::Thread>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-3639",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
+   "name" : "const android::sp<android::hardware::BHwBinder>",
+   "referenced_type" : "type-425",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2308",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::HidlMemory>",
+   "name" : "const android::sp<android::hardware::HidlMemory>",
+   "referenced_type" : "type-93",
+   "self_type" : "type-100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2168",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-922",
+   "self_type" : "type-2217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2334",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3388",
+   "self_type" : "type-3387",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-383",
+   "self_type" : "type-439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
+   "name" : "const android::sp<android::hardware::IInterface>",
+   "referenced_type" : "type-928",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18122,8 +28616,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "const android::sp<android::hardware::PassthroughServiceManager>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-720",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18132,8 +28626,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-893",
-   "self_type" : "type-898",
+   "referenced_type" : "type-444",
+   "self_type" : "type-449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18142,8 +28636,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "const android::sp<android::hardware::details::ClientCounterCallback>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-978",
+   "referenced_type" : "type-555",
+   "self_type" : "type-558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18152,8 +28646,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::details::Waiter>",
    "name" : "const android::sp<android::hardware::details::Waiter>",
-   "referenced_type" : "type-158",
-   "self_type" : "type-167",
+   "referenced_type" : "type-744",
+   "self_type" : "type-753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18162,8 +28656,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_binder_death_recipient>",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18172,8 +28666,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-81",
+   "self_type" : "type-80",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18182,8 +28676,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-173",
-   "self_type" : "type-861",
+   "referenced_type" : "type-300",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18192,8 +28686,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceManager>",
-   "referenced_type" : "type-258",
-   "self_type" : "type-299",
+   "referenced_type" : "type-526",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18202,8 +28696,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-146",
-   "self_type" : "type-145",
+   "referenced_type" : "type-542",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18212,8 +28706,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_1::IServiceManager>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-116",
+   "referenced_type" : "type-531",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18222,8 +28716,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IClientCallback>",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "type-548",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18232,8 +28726,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "const android::sp<android::hidl::manager::V1_2::IServiceManager>",
-   "referenced_type" : "type-127",
-   "self_type" : "type-126",
+   "referenced_type" : "type-537",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18242,8 +28736,36 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::BHwBinder>",
    "name" : "const android::wp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-872",
+   "referenced_type" : "type-331",
+   "self_type" : "type-422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
+   "referenced_type" : "type-901",
+   "self_type" : "type-2171",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1213",
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
+   "name" : "const android::wp<android::hardware::IBinder>",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-3562",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18251,24 +28773,24 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::IBinder>",
    "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-3652",
+   "self_type" : "type-3651",
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
   {
@@ -18276,8 +28798,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hardware::hidl_death_recipient>",
    "name" : "const android::wp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-359",
-   "self_type" : "type-867",
+   "referenced_type" : "type-307",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18286,18 +28808,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::wp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-65",
+   "referenced_type" : "type-309",
+   "self_type" : "type-414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const binder_buffer_object",
+   "name" : "const binder_buffer_object",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
+   "size" : 40,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-904",
+   "referenced_type" : "type-29",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18306,18 +28838,28 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-101",
+   "referenced_type" : "type-43",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const char *const",
+   "name" : "const char *const",
+   "referenced_type" : "type-41",
+   "self_type" : "type-2289",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 2,
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18326,8 +28868,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18336,8 +28878,8 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18346,8 +28888,18 @@
    "is_const" : true,
    "linker_set_key" : "const dirent",
    "name" : "const dirent",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2917",
+   "size" : 276,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const dirent",
+   "name" : "const dirent",
+   "referenced_type" : "type-997",
+   "self_type" : "type-996",
    "size" : 276,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18364,10 +28916,20 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const flat_binder_object",
+   "name" : "const flat_binder_object",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-723",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-237",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18376,8 +28938,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-441",
+   "referenced_type" : "type-14",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18385,240 +28947,360 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1063",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1247",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1301",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1503",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1542",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1680",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1841",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1837",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-203",
-   "self_type" : "type-202",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2449",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2642",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-238",
-   "self_type" : "type-237",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2681",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-272",
+   "self_type" : "type-271",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
+   "referenced_type" : "type-2750",
+   "self_type" : "type-2749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2775",
+   "self_type" : "type-2774",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-2894",
+   "self_type" : "type-2893",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-85",
+   "referenced_type" : "type-2981",
+   "self_type" : "type-2980",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-918",
-   "self_type" : "type-917",
+   "referenced_type" : "type-3036",
+   "self_type" : "type-3035",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-987",
-   "self_type" : "type-986",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3164",
+   "self_type" : "type-3163",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3208",
+   "self_type" : "type-3207",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-656",
+   "self_type" : "type-655",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-68",
+   "self_type" : "type-67",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-704",
+   "self_type" : "type-703",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-811",
+   "self_type" : "type-810",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18626,8 +29308,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-671",
+   "referenced_type" : "type-179",
+   "self_type" : "type-182",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18636,8 +29318,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-802",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-336",
+   "self_type" : "type-604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18646,8 +29328,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-13",
+   "self_type" : "type-12",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18656,8 +29338,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-556",
-   "self_type" : "type-970",
+   "referenced_type" : "type-151",
+   "self_type" : "type-547",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18666,8 +29348,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18676,8 +29358,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1070",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18686,8 +29368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18696,8 +29378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1203",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18706,8 +29388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18716,8 +29398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1316",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18726,8 +29408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18736,8 +29418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1548",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18746,8 +29428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18756,8 +29438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1684",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18766,8 +29448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1776",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18776,8 +29458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18786,8 +29468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1736",
+   "referenced_type" : "type-1905",
+   "self_type" : "type-1904",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18796,8 +29478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18806,8 +29488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18816,8 +29498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18826,8 +29508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18836,8 +29518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18846,8 +29528,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18856,8 +29538,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-225",
-   "self_type" : "type-224",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18866,8 +29548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-28",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18876,8 +29558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18886,8 +29568,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2765",
+   "self_type" : "type-2764",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18896,8 +29578,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2824",
+   "self_type" : "type-2823",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18906,8 +29588,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-632",
-   "self_type" : "type-631",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18916,8 +29598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-2916",
+   "self_type" : "type-2915",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18926,8 +29608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-2988",
+   "self_type" : "type-2987",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18936,8 +29618,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-92",
-   "self_type" : "type-91",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3043",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3101",
+   "self_type" : "type-3100",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3260",
+   "self_type" : "type-3259",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3796",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3869",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-481",
+   "self_type" : "type-480",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-710",
+   "self_type" : "type-709",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-880",
+   "self_type" : "type-879",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-995",
+   "self_type" : "type-994",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18946,8 +29768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1262",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18956,8 +29778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18966,8 +29788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18976,8 +29798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18986,8 +29808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -18996,8 +29818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19006,8 +29828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19016,8 +29838,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1751",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19026,8 +29848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19036,8 +29858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19046,8 +29868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-2028",
-   "self_type" : "type-2027",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19056,8 +29878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "type-2056",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19066,8 +29888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19076,8 +29898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19086,8 +29908,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2662",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19096,8 +29918,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-2781",
+   "self_type" : "type-2780",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19106,8 +29928,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-645",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2833",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19116,8 +29938,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2948",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3000",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3056",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3121",
+   "self_type" : "type-3120",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3191",
+   "self_type" : "type-3190",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3242",
+   "self_type" : "type-3241",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-685",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-817",
+   "self_type" : "type-816",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::PidConstant, 1>",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19126,8 +30048,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1260",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19136,8 +30058,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19146,8 +30068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19156,8 +30078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19166,8 +30088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1562",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1521",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19176,8 +30098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1639",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19186,8 +30108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1692",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19196,8 +30118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1750",
-   "self_type" : "type-1749",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19206,8 +30128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19216,8 +30138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1867",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19226,8 +30148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19236,8 +30158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19246,8 +30168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19256,8 +30178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2477",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19266,8 +30188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-2661",
+   "self_type" : "type-2660",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19276,8 +30198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2779",
+   "self_type" : "type-2778",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19286,8 +30208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-643",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19296,8 +30218,108 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
    "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-2947",
+   "self_type" : "type-2946",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-2999",
+   "self_type" : "type-2998",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3118",
+   "self_type" : "type-3117",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3189",
+   "self_type" : "type-3188",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3240",
+   "self_type" : "type-3239",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-3816",
+   "self_type" : "type-3815",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-510",
+   "self_type" : "type-509",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-683",
+   "self_type" : "type-682",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-815",
+   "self_type" : "type-814",
+   "size" : 3,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "name" : "const std::array<android::hidl::manager::V1_0::IServiceManager::Transport, 3>",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 3,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h"
   },
@@ -19306,8 +30328,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19316,48 +30368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1152",
-   "self_type" : "type-1151",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19366,8 +30378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19376,38 +30388,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1496",
    "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1546",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1617",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-166",
-   "self_type" : "type-165",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19416,8 +30408,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1683",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1789",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19426,8 +30428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1850",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19436,8 +30438,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1906",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
   },
@@ -19446,8 +30448,28 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1967",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2043",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
   },
@@ -19456,8 +30478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-1939",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19466,8 +30488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2010",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2462",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
@@ -19476,8 +30498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2539",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19486,8 +30508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2635",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19496,8 +30518,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-231",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2769",
+   "self_type" : "type-2768",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
   },
@@ -19506,6 +30538,106 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2929",
+   "self_type" : "type-2928",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2990",
+   "self_type" : "type-2989",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3105",
+   "self_type" : "type-3104",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3222",
+   "self_type" : "type-3221",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3801",
+   "self_type" : "type-3800",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "referenced_type" : "type-3",
    "self_type" : "type-2",
    "size" : 12,
@@ -19516,58 +30648,68 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-634",
-   "self_type" : "type-633",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlTransportSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-819",
-   "size" : 12,
-   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 12,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-599",
+   "self_type" : "type-598",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-752",
+   "self_type" : "type-751",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-805",
+   "self_type" : "type-804",
+   "size" : 12,
+   "source_file" : "/system/libhidl/transport/include/hidl/ServiceManagement.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19576,8 +30718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2534",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19586,8 +30728,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBase> (void *)>",
    "name" : "const std::function<sp<IBase> (void *)>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBase> (void *)>",
+   "name" : "const std::function<sp<IBase> (void *)>",
+   "referenced_type" : "type-594",
+   "self_type" : "type-593",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19596,8 +30748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19606,8 +30758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19616,8 +30768,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
    "name" : "const std::function<sp<IBinder> (void *)>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-814",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<sp<IBinder> (void *)>",
+   "name" : "const std::function<sp<IBinder> (void *)>",
+   "referenced_type" : "type-3727",
+   "self_type" : "type-3726",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -19626,8 +30788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1185",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
   },
@@ -19636,8 +30798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 24,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
   },
@@ -19646,128 +30808,248 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<void ()>",
    "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-247",
+   "self_type" : "type-246",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3453",
+   "self_type" : "type-3452",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<void ()>",
+   "name" : "const std::function<void ()>",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 24,
+   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1068",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1847",
+   "self_type" : "type-1846",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2904",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3040",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3099",
+   "self_type" : "type-3098",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
+   "referenced_type" : "type-976",
+   "self_type" : "type-975",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
    "referenced_type" : "type-1760",
    "self_type" : "type-1759",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-733",
-   "self_type" : "type-732",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
-   "size" : 24,
-   "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1677",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1733",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1841",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-564",
-   "self_type" : "type-563",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "name" : "const std::initializer_list<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-630",
-   "self_type" : "type-629",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19776,8 +31058,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1844",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19786,8 +31068,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19796,8 +31078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19806,8 +31088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2031",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19816,8 +31098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19826,8 +31108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-2899",
+   "self_type" : "type-2898",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19836,8 +31118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-2984",
+   "self_type" : "type-2983",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19846,8 +31128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19856,18 +31138,58 @@
    "is_const" : true,
    "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
    "name" : "const std::initializer_list<android::hardware::hidl_string>",
-   "referenced_type" : "type-628",
-   "self_type" : "type-627",
+   "referenced_type" : "type-3097",
+   "self_type" : "type-3096",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::initializer_list<android::hardware::hidl_string>",
+   "name" : "const std::initializer_list<android::hardware::hidl_string>",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19876,8 +31198,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<int, std::allocator<int> >",
    "name" : "const std::vector<int, std::allocator<int> >",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2756",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<int, std::allocator<int> >",
+   "name" : "const std::vector<int, std::allocator<int> >",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19886,8 +31218,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19896,8 +31228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19906,8 +31238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19916,8 +31248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19926,8 +31258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19936,8 +31268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19946,8 +31278,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19956,8 +31288,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1526",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19966,8 +31298,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1552",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19976,58 +31308,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1360",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1473",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20046,8 +31328,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20056,8 +31338,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20066,8 +31348,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20076,8 +31358,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20086,8 +31368,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20106,8 +31398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20116,8 +31408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20126,8 +31418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20136,8 +31428,178 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-291",
-   "self_type" : "type-290",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2131",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2486",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2691",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2720",
+   "self_type" : "type-2719",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2836",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2840",
+   "self_type" : "type-2839",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2961",
+   "self_type" : "type-2960",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3009",
+   "self_type" : "type-3008",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3026",
+   "self_type" : "type-3025",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3065",
+   "self_type" : "type-3064",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3194",
+   "self_type" : "type-3193",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20156,8 +31618,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-342",
-   "self_type" : "type-341",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3716",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20166,8 +31628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20176,8 +31638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-596",
-   "self_type" : "type-595",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20186,8 +31648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-614",
-   "self_type" : "type-613",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20196,8 +31658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20206,8 +31668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-610",
+   "self_type" : "type-609",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20216,8 +31678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-805",
-   "self_type" : "type-804",
+   "referenced_type" : "type-688",
+   "self_type" : "type-687",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20226,8 +31688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-714",
+   "self_type" : "type-713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20236,8 +31698,48 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-96",
-   "self_type" : "type-95",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20246,28 +31748,48 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-182",
-   "self_type" : "type-454",
+   "referenced_type" : "type-146",
+   "self_type" : "type-522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned char *const",
+   "name" : "const unsigned char *const",
+   "referenced_type" : "type-990",
+   "self_type" : "type-3538",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-102",
-   "self_type" : "type-677",
+   "referenced_type" : "type-44",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const unsigned int *const",
+   "name" : "const unsigned int *const",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3540",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-16",
+   "self_type" : "type-611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20276,8 +31798,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-254",
-   "self_type" : "type-981",
+   "referenced_type" : "type-71",
+   "self_type" : "type-561",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20285,38 +31807,121 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-108",
-   "self_type" : "type-295",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const void *const",
+   "name" : "const void *const",
+   "referenced_type" : "type-78",
+   "self_type" : "type-2198",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "void *const",
+   "name" : "void *const",
+   "referenced_type" : "type-188",
+   "self_type" : "type-3480",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
+  },
+  {
    "alignment" : 1,
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-45",
-   "self_type" : "type-860",
+   "referenced_type" : "type-29",
+   "self_type" : "type-409",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-14",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
   }
  ],
  "record_types" :
  [
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-7"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-2314"
+    },
+    {
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-2315"
+    }
+   ],
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mFrameLines",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::CallStack",
    "name" : "android::CallStack",
    "record_kind" : "class",
-   "referenced_type" : "type-685",
-   "self_type" : "type-685",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStackE"
@@ -20325,27 +31930,37 @@
    "alignment" : 1,
    "linker_set_key" : "android::CallStack::StackDeleter",
    "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-689",
-   "self_type" : "type-689",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/CallStack.h",
    "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::CompileTimeAssert<true>",
+   "name" : "android::CompileTimeAssert<true>",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3615",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Debug.h",
+   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-847"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-395",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -20357,17 +31972,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-375"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-763", "type-72" ],
+   "template_args" : [ "type-286", "type-383" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -20376,18 +31991,38 @@
    [
     {
      "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2154"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-742" ],
+   "template_args" : [ "type-257" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -20397,17 +32032,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -20417,14 +32052,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-389"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-388",
+   "self_type" : "type-388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -20436,14 +32071,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-844"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -20453,7 +32088,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-255"
     }
    ],
    "fields" :
@@ -20462,20 +32097,20 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-257",
+   "self_type" : "type-257",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -20487,14 +32122,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-851"
+     "referenced_type" : "type-400"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -20506,14 +32141,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-855"
+     "referenced_type" : "type-404"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -20525,14 +32160,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-855"
+     "referenced_type" : "type-404"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -20545,14 +32180,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -20592,8 +32227,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -20603,8 +32238,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -20614,8 +32249,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-7",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -20641,14 +32276,14 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -20659,17 +32294,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-192"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-830",
-   "self_type" : "type-830",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-831" ],
+   "template_args" : [ "type-376" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -20716,14 +32351,72 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-675"
+     "access" : "private",
+     "referenced_type" : "type-192"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2155" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -20781,14 +32474,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-764"
+     "referenced_type" : "type-287"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -20800,14 +32493,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -20818,7 +32511,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "fields" :
@@ -20827,62 +32520,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-904"
+     "referenced_type" : "type-455"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-839"
+     "referenced_type" : "type-388"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-846"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-860"
+     "referenced_type" : "type-409"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-860"
+     "referenced_type" : "type-409"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-901"
+     "referenced_type" : "type-452"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-903",
-   "self_type" : "type-903",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -20972,17 +32665,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-66" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -21027,17 +32720,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-36" ],
+   "template_args" : [ "type-308" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -21082,17 +32775,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::String8>",
    "name" : "android::Vector<android::String8>",
    "record_kind" : "class",
-   "referenced_type" : "type-681",
-   "self_type" : "type-681",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
    "vtable_components" :
    [
@@ -21137,17 +32830,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-379",
+   "self_type" : "type-379",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-798" ],
+   "template_args" : [ "type-332" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -21192,17 +32885,72 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-377",
+   "self_type" : "type-377",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-833" ],
+   "template_args" : [ "type-378" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -21243,38 +32991,148 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-187"
+    }
+   ],
+   "linker_set_key" : "android::Vector<int>",
+   "name" : "android::Vector<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6VectorIiEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-189"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-189"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -21326,14 +33184,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-124"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -21357,29 +33215,640 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3686",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286", "type-383" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-2146"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2140"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mHandle",
+     "field_offset" : 32,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 64,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlive",
+     "field_offset" : 96,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObitsSent",
+     "field_offset" : 128,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObituaries",
+     "field_offset" : 160,
+     "referenced_type" : "type-2150"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 192,
+     "referenced_type" : "type-2152"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mConstantData",
+     "field_offset" : 352,
+     "referenced_type" : "type-2159"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDescriptorCache",
+     "field_offset" : 384,
+     "referenced_type" : "type-286"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder",
+   "name" : "android::hardware::BpHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2148",
+   "size" : 60,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 52,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -52,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "recipient",
+     "referenced_type" : "type-901"
+    },
+    {
+     "field_name" : "cookie",
+     "field_offset" : 64,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "flags",
+     "field_offset" : 96,
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
+   "name" : "android::hardware::BpHwBinder::Obituary",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "referenced_type" : "type-2153"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
+   "name" : "android::hardware::BpHwBinder::ObjectManager",
+   "record_kind" : "class",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2152",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "object",
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "cleanupCookie",
+     "field_offset" : 32,
+     "referenced_type" : "type-188"
+    },
+    {
+     "field_name" : "func",
+     "field_offset" : 64,
+     "referenced_type" : "type-2157"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
+   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-2178"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-308"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-2180"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2285"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mFlags",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSeq",
+     "field_offset" : 64,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIndex",
+     "field_offset" : 96,
+     "referenced_type" : "type-568"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mGlobalState",
+     "field_offset" : 160,
+     "referenced_type" : "type-2282"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BufferedTextOutput",
+   "name" : "android::hardware::BufferedTextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
+    }
+   ]
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-31"
+     "referenced_type" : "type-665"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-32"
+     "referenced_type" : "type-666"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-38" ],
+   "template_args" : [ "type-309", "type-367" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS0_7details9SchedPrioEEE"
   },
   {
@@ -21389,23 +33858,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-671"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-44"
+     "referenced_type" : "type-672"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "name" : "android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
+   "referenced_type" : "type-670",
+   "self_type" : "type-670",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-33", "type-45" ],
+   "template_args" : [ "type-309", "type-29" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEE"
   },
   {
@@ -21415,23 +33884,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-793"
+     "referenced_type" : "type-327"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-328"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "name" : "android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-795", "type-797" ],
+   "template_args" : [ "type-329", "type-331" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEE"
   },
   {
@@ -21441,23 +33910,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-588"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-329"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-330", "type-331" ],
+   "template_args" : [ "type-590", "type-591" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEE"
   },
   {
@@ -21467,23 +33936,23 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-322"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-323"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "name" : "android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> >",
    "record_kind" : "class",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-324", "type-325" ],
+   "template_args" : [ "type-350", "type-351" ],
    "unique_id" : "_ZTSN7android8hardware13ConcurrentMapINSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS2_8functionIFNS_2spINS0_7IBinderEEEPvEEEEE"
   },
   {
@@ -21492,50 +33961,99 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
   },
   {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-78"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSize",
+     "field_offset" : 32,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBytesPerLine",
+     "field_offset" : 64,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSingleLineCutoff",
+     "field_offset" : 96,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAlignment",
+     "field_offset" : 128,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCArrayStyle",
+     "field_offset" : 160,
+     "referenced_type" : "type-29"
+    }
+   ],
+   "linker_set_key" : "android::hardware::HexDump",
+   "name" : "android::hardware::HexDump",
+   "record_kind" : "class",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
+  },
+  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-60"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-349",
-   "self_type" : "type-349",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -21612,19 +34130,439 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-449"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-381"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-2160"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-2160"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-41"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-2247"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-2248"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mImpl",
-     "referenced_type" : "type-929"
+     "referenced_type" : "type-485"
     }
    ],
    "linker_set_key" : "android::hardware::LazyServiceRegistrar",
    "name" : "android::hardware::LazyServiceRegistrar",
    "record_kind" : "class",
-   "referenced_type" : "type-928",
-   "self_type" : "type-928",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlLazyUtils.h",
    "unique_id" : "_ZTSN7android8hardware20LazyServiceRegistrarE"
@@ -21636,42 +34574,409 @@
     {
      "access" : "private",
      "field_name" : "mGrantors",
-     "referenced_type" : "type-457"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mQuantum",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
    "name" : "android::hardware::MQDescriptor<char, android::hardware::kSynchronizedReadWrite>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware12MQDescriptorIcLNS0_8MQFlavorE1EEE"
   },
   {
    "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-2161"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-230"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-2162"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-2163"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-188"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-44"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 32,
+     "referenced_type" : "type-16"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 96,
+     "referenced_type" : "type-16"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "is_virtual" : true,
+     "referenced_type" : "type-18"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-2251"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-2252"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-44"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 224,
+     "referenced_type" : "type-336"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 288,
+     "referenced_type" : "type-388"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 320,
+     "referenced_type" : "type-377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 480,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 512,
+     "referenced_type" : "type-2243"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 544,
+     "referenced_type" : "type-188"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 576,
+     "referenced_type" : "type-382"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 736,
+     "referenced_type" : "type-165"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 768,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 776,
+     "referenced_type" : "type-29"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 800,
+     "referenced_type" : "type-2149"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 832,
+     "referenced_type" : "type-189"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-2244"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
+   "size" : 120,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 112,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2141"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21680,17 +34985,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport>",
    "record_kind" : "class",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-765",
+   "self_type" : "type-765",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-181" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_4hidl7manager4V1_015IServiceManager9TransportEEE"
   },
   {
@@ -21698,7 +35003,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21707,17 +35012,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> >",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-173" ],
+   "template_args" : [ "type-300" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl4base4V1_05IBaseEEEEE"
   },
   {
@@ -21725,7 +35030,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21734,17 +35039,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-945",
+   "self_type" : "type-945",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-258" ],
+   "template_args" : [ "type-526" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_015IServiceManagerEEEEE"
   },
   {
@@ -21752,7 +35057,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21761,17 +35066,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> >",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-146" ],
+   "template_args" : [ "type-542" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_020IServiceNotificationEEEEE"
   },
   {
@@ -21779,7 +35084,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21788,17 +35093,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-111" ],
+   "template_args" : [ "type-531" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_115IServiceManagerEEEEE"
   },
   {
@@ -21806,7 +35111,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21815,17 +35120,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1946",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-548" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IClientCallbackEEEEE"
   },
   {
@@ -21833,7 +35138,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21842,17 +35147,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-127" ],
+   "template_args" : [ "type-537" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS_4hidl7manager4V1_215IServiceManagerEEEEE"
   },
   {
@@ -21860,7 +35165,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "fields" :
@@ -21869,17 +35174,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -21887,17 +35192,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-112"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-104",
-   "self_type" : "type-104",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -21907,48 +35212,131 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-104"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput",
+   "name" : "android::hardware::TextOutput",
+   "record_kind" : "class",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTO",
+     "referenced_type" : "type-2287"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TextOutput::Bundle",
+   "name" : "android::hardware::TextOutput::Bundle",
+   "record_kind" : "class",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCode",
+     "referenced_type" : "type-44"
+    }
+   ],
+   "linker_set_key" : "android::hardware::TypeCode",
+   "name" : "android::hardware::TypeCode",
+   "record_kind" : "class",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
+   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, android::hardware::details::SchedPrio> >",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-30" ],
+   "template_args" : [ "type-664" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEENS1_9SchedPrioEEEEE"
   },
   {
@@ -21958,17 +35346,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<android::wp<android::hidl::base::V1_0::IBase>, bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-42" ],
+   "template_args" : [ "type-670" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINS_2wpINS_4hidl4base4V1_05IBaseEEEbEEEE"
   },
   {
@@ -21978,17 +35366,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<const android::hidl::base::V1_0::IBase *, android::wp<android::hardware::BHwBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-792" ],
+   "template_args" : [ "type-326" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapIPKNS_4hidl4base4V1_05IBaseENS_2wpINS0_9BHwBinderEEEEEEE"
   },
   {
@@ -21998,17 +35386,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBase> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-327" ],
+   "template_args" : [ "type-587" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS_4hidl4base4V1_05IBaseEEEPvEEEEEEE"
   },
   {
@@ -22018,17 +35406,17 @@
     {
      "access" : "private",
      "field_name" : "buffer",
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "name" : "android::hardware::details::DoNotDestruct<android::hardware::ConcurrentMap<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<sp<IBinder> (void *)> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 16,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h",
-   "template_args" : [ "type-321" ],
+   "template_args" : [ "type-347" ],
    "unique_id" : "_ZTSN7android8hardware7details13DoNotDestructINS0_13ConcurrentMapINSt3__112basic_stringIcNS4_11char_traitsIcEENS4_9allocatorIcEEEENS4_8functionIFNS_2spINS0_7IBinderEEEPvEEEEEEE"
   },
   {
@@ -22039,31 +35427,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-129"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-130"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-131"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-128",
+   "self_type" : "type-128",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -22092,18 +35480,18 @@
    [
     {
      "field_name" : "sched_policy",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "prio",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android::hardware::details::SchedPrio",
    "name" : "android::hardware::details::SchedPrio",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-367",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/transport/include/hidl/Static.h",
    "unique_id" : "_ZTSN7android8hardware7details9SchedPrioE"
@@ -22115,14 +35503,14 @@
     {
      "access" : "private",
      "field_name" : "mQueue",
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-209"
     }
    ],
    "linker_set_key" : "android::hardware::details::TaskRunner",
    "name" : "android::hardware::details::TaskRunner",
    "record_kind" : "class",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/TaskRunner.h",
    "unique_id" : "_ZTSN7android8hardware7details10TaskRunnerE"
@@ -22131,8 +35519,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -22141,8 +35529,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -22151,8 +35539,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-161",
+   "self_type" : "type-161",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -22164,19 +35552,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-460"
+     "referenced_type" : "type-260"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -22188,19 +35576,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-795"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<InstanceDebugInfo>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-794",
+   "self_type" : "type-794",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEUt_E"
@@ -22211,16 +35599,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-459"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22229,16 +35617,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-972" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22247,16 +35635,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-572"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_string>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
+   "referenced_type" : "type-571",
+   "self_type" : "type-571",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEE"
   },
   {
@@ -22265,16 +35653,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-794"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::details::hidl_pointer<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-793",
+   "self_type" : "type-793",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -22283,16 +35671,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-986"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>",
    "name" : "android::hardware::details::hidl_pointer<char>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-985",
+   "self_type" : "type-985",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEE"
   },
   {
@@ -22302,19 +35690,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-186"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-986",
+   "self_type" : "type-986",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIcEUt_E"
@@ -22325,16 +35713,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-40"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -22344,19 +35732,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-41"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -22367,16 +35755,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-10"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-9",
+   "self_type" : "type-9",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -22386,19 +35774,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-10",
+   "self_type" : "type-10",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -22410,19 +35798,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-971"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_array<unsigned char, 32> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIhLj32EJEEEEUt_E"
@@ -22434,19 +35822,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-45"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<hidl_string>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-572",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_stringEEUt_E"
@@ -22457,16 +35845,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-474"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>",
    "name" : "android::hardware::details::hidl_pointer<int>",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEE"
   },
   {
@@ -22476,19 +35864,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-475"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIiEUt_E"
@@ -22499,16 +35887,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-270"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-13" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -22518,19 +35906,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-36"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-270",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -22552,20 +35940,20 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-106"
+     "referenced_type" : "type-103"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-105",
-   "self_type" : "type-105",
+   "referenced_type" : "type-112",
+   "self_type" : "type-112",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -22574,11 +35962,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned char, 32>",
    "name" : "android::hardware::details::std_array<unsigned char, 32>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-989",
+   "self_type" : "type-989",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIhLj32EJEEE"
   },
   {
@@ -22588,16 +35976,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-973"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned char, 32>",
    "name" : "android::hardware::hidl_array<unsigned char, 32>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-972",
+   "self_type" : "type-972",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIhLj32EJEEE"
   },
   {
@@ -22605,7 +35993,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-310"
     }
    ],
    "fields" :
@@ -22614,25 +36002,25 @@
      "access" : "private",
      "field_name" : "mRecipient",
      "field_offset" : 32,
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-307"
     },
     {
      "access" : "private",
      "field_name" : "mCookie",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mBase",
      "field_offset" : 160,
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-309"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_binder_death_recipient",
    "name" : "android::hardware::hidl_binder_death_recipient",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "size" : 36,
    "source_file" : "/system/libhidl/transport/include/hidl/HidlBinderSupport.h",
    "unique_id" : "_ZTSN7android8hardware27hidl_binder_death_recipientE",
@@ -22712,13 +36100,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -22800,19 +36188,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-9"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -22824,25 +36212,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-28"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -22854,25 +36242,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-39"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -22884,28 +36272,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-458"
+     "referenced_type" : "type-258"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-461" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -22915,28 +36303,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-431"
+     "referenced_type" : "type-969"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<unsigned char, 32> >",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-434" ],
+   "template_args" : [ "type-972" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEE"
   },
   {
@@ -22946,28 +36334,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-425"
+     "referenced_type" : "type-571"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_string>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-97" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEEE"
   },
   {
@@ -22977,28 +36365,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-793"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
    "name" : "android::hardware::hidl_vec<android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo>",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-792",
+   "self_type" : "type-792",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-502" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS_4hidl7manager4V1_015IServiceManager17InstanceDebugInfoEEE"
   },
   {
@@ -23008,28 +36396,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-985"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<char>",
    "name" : "android::hardware::hidl_vec<char>",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-984",
+   "self_type" : "type-984",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIcEE"
   },
   {
@@ -23037,7 +36425,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-991"
+     "referenced_type" : "type-576"
     }
    ],
    "fields" :
@@ -23045,14 +36433,14 @@
     {
      "access" : "private",
      "field_name" : "mPtr",
-     "referenced_type" : "type-189"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "name" : "android::hardware::hidl_vec<hidl_string>::iter<true>",
    "record_kind" : "class",
-   "referenced_type" : "type-990",
-   "self_type" : "type-990",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_stringEE4iterILb1EEE"
@@ -23064,28 +36452,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<int>",
    "name" : "android::hardware::hidl_vec<int>",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-472",
+   "self_type" : "type-472",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIiEE"
   },
   {
@@ -23095,19 +36483,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -23117,10 +36505,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-303"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23129,13 +36517,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 512,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BnHwBase",
    "name" : "android::hidl::base::V1_0::BnHwBase",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 76,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BnHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BnHwBaseE",
@@ -23257,10 +36645,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-371"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23269,19 +36657,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-369"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-370"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BpHwBase",
    "name" : "android::hidl::base::V1_0::BpHwBase",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BpHwBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_08BpHwBaseE",
@@ -23464,10 +36852,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -23476,19 +36864,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-861"
+     "referenced_type" : "type-410"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::BsBase",
    "name" : "android::hidl::base::V1_0::BsBase",
-   "referenced_type" : "type-1824",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2062",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/BsBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_06BsBaseE",
@@ -23614,23 +37002,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-16"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-280"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -23641,13 +37029,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-18"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-302",
+   "self_type" : "type-302",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -23756,7 +37144,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23765,13 +37153,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-526"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BnHwServiceManager",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-828",
+   "self_type" : "type-828",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BnHwServiceManagerE",
@@ -23893,7 +37281,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -23902,13 +37290,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-146"
+     "referenced_type" : "type-542"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BnHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BnHwServiceNotification",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BnHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BnHwServiceNotificationE",
@@ -24030,10 +37418,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-833"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24042,19 +37430,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-831"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-832"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_0::BpHwServiceManager",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-830",
+   "self_type" : "type-830",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_018BpHwServiceManagerE",
@@ -24261,10 +37649,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-825"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24273,19 +37661,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-250"
+     "referenced_type" : "type-823"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-824"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BpHwServiceNotification",
    "name" : "android::hidl::manager::V1_0::BpHwServiceNotification",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-822",
+   "self_type" : "type-822",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BpHwServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_023BpHwServiceNotificationE",
@@ -24471,10 +37859,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-504"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24483,19 +37871,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-529"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceManager",
    "name" : "android::hidl::manager::V1_0::BsServiceManager",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-917",
+   "self_type" : "type-917",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_016BsServiceManagerE",
@@ -24644,10 +38032,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-148"
+     "referenced_type" : "type-495"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -24656,19 +38044,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-545"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::BsServiceNotification",
    "name" : "android::hidl::manager::V1_0::BsServiceNotification",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/BsServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_021BsServiceNotificationE",
@@ -24796,13 +38184,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager",
    "name" : "android::hidl::manager::V1_0::IServiceManager",
-   "referenced_type" : "type-114",
-   "self_type" : "type-114",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManagerE",
@@ -24944,33 +38332,33 @@
    [
     {
      "field_name" : "interfaceName",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "instanceName",
      "field_offset" : 128,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-38"
     },
     {
      "field_name" : "pid",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "clientPids",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-472"
     },
     {
      "field_name" : "arch",
      "field_offset" : 448,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-280"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
    "name" : "android::hidl::manager::V1_0::IServiceManager::InstanceDebugInfo",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-502",
+   "self_type" : "type-502",
    "size" : 64,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_015IServiceManager17InstanceDebugInfoE"
@@ -24980,13 +38368,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -25099,7 +38487,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25108,13 +38496,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-111"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BnHwServiceManager",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BnHwServiceManagerE",
@@ -25236,10 +38624,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-842"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25248,19 +38636,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-840"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-841"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_1::BpHwServiceManager",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-839",
+   "self_type" : "type-839",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_118BpHwServiceManagerE",
@@ -25470,10 +38858,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -25482,19 +38870,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-116"
+     "referenced_type" : "type-534"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::BsServiceManager",
    "name" : "android::hidl::manager::V1_1::BsServiceManager",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1099",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_116BsServiceManagerE",
@@ -25646,13 +39034,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-114"
+     "referenced_type" : "type-504"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_1::IServiceManager",
    "name" : "android::hidl::manager::V1_1::IServiceManager",
-   "referenced_type" : "type-113",
-   "self_type" : "type-113",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.1/android.hidl.manager@1.1_genc++_headers/gen/android/hidl/manager/1.1/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_115IServiceManagerE",
@@ -25797,7 +39185,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25806,13 +39194,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-154"
+     "referenced_type" : "type-548"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BnHwClientCallback",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwClientCallbackE",
@@ -25934,7 +39322,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-229"
+     "referenced_type" : "type-299"
     }
    ],
    "fields" :
@@ -25943,13 +39331,13 @@
      "access" : "private",
      "field_name" : "_hidl_mImpl",
      "field_offset" : 544,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-537"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BnHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BnHwServiceManager",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BnHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BnHwServiceManagerE",
@@ -26071,10 +39459,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-851"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26083,19 +39471,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-849"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-281"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwClientCallback",
    "name" : "android::hidl::manager::V1_2::BpHwClientCallback",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwClientCallbackE",
@@ -26281,10 +39669,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-134"
+     "referenced_type" : "type-732"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26293,19 +39681,19 @@
      "access" : "private",
      "field_name" : "_hidl_mMutex",
      "field_offset" : 544,
-     "referenced_type" : "type-132"
+     "referenced_type" : "type-730"
     },
     {
      "access" : "private",
      "field_name" : "_hidl_mDeathRecipients",
      "field_offset" : 576,
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-731"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BpHwServiceManager",
    "name" : "android::hidl::manager::V1_2::BpHwServiceManager",
-   "referenced_type" : "type-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 92,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BpHwServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_218BpHwServiceManagerE",
@@ -26530,10 +39918,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-156"
+     "referenced_type" : "type-498"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26542,19 +39930,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-553"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsClientCallback",
    "name" : "android::hidl::manager::V1_2::BsClientCallback",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1929",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsClientCallbackE",
@@ -26682,10 +40070,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-517"
     },
     {
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-128"
     }
    ],
    "fields" :
@@ -26694,19 +40082,19 @@
      "access" : "private",
      "field_name" : "mImpl",
      "field_offset" : 384,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-540"
     },
     {
      "access" : "private",
      "field_name" : "mOnewayQueue",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::BsServiceManager",
    "name" : "android::hidl::manager::V1_2::BsServiceManager",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2004",
    "size" : 68,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/BsServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_216BsServiceManagerE",
@@ -26873,13 +40261,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IClientCallback",
    "name" : "android::hidl::manager::V1_2::IClientCallback",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IClientCallback.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IClientCallbackE",
@@ -26992,13 +40380,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-113"
+     "referenced_type" : "type-514"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_2::IServiceManager",
    "name" : "android::hidl::manager::V1_2::IServiceManager",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.2/android.hidl.manager@1.2_genc++_headers/gen/android/hidl/manager/1.2/IServiceManager.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_215IServiceManagerE",
@@ -27163,19 +40551,65 @@
    "fields" :
    [
     {
+     "field_name" : "key",
+     "referenced_type" : "type-286"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-383"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3617",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286", "type-383" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "key",
+     "referenced_type" : "type-78"
+    },
+    {
+     "field_name" : "value",
+     "field_offset" : 32,
+     "referenced_type" : "type-2156"
+    }
+   ],
+   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78", "type-2156" ],
+   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-902"
+     "referenced_type" : "type-453"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-901",
-   "self_type" : "type-901",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-903" ],
+   "template_args" : [ "type-454" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -27185,17 +40619,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-426" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -27205,17 +40639,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-2282"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2284" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-94"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::HidlMemory>",
    "name" : "android::sp<android::hardware::HidlMemory>",
    "record_kind" : "class",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-349" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10HidlMemoryEEE"
   },
   {
@@ -27225,17 +40679,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-902"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-379" ],
+   "template_args" : [ "type-923" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -27245,17 +40699,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-384"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-386" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -27265,17 +40719,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-929"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IInterface>",
    "name" : "android::sp<android::hardware::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-928",
+   "self_type" : "type-928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-387" ],
+   "template_args" : [ "type-931" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
   },
   {
@@ -27285,17 +40739,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-119"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::PassthroughServiceManager>",
    "name" : "android::sp<android::hardware::PassthroughServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-121" ],
+   "template_args" : [ "type-723" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware25PassthroughServiceManagerEEE"
   },
   {
@@ -27305,17 +40759,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-894"
+     "referenced_type" : "type-445"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-893",
-   "self_type" : "type-893",
+   "referenced_type" : "type-444",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-896" ],
+   "template_args" : [ "type-447" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -27325,17 +40779,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-972"
+     "referenced_type" : "type-551"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "name" : "android::sp<android::hardware::details::ClientCounterCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-975",
-   "self_type" : "type-975",
+   "referenced_type" : "type-555",
+   "self_type" : "type-555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-976" ],
+   "template_args" : [ "type-556" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details21ClientCounterCallbackEEE"
   },
   {
@@ -27345,17 +40799,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-149"
+     "referenced_type" : "type-739"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::details::Waiter>",
    "name" : "android::sp<android::hardware::details::Waiter>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-744",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-745" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7details6WaiterEEE"
   },
   {
@@ -27365,17 +40819,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-311"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-908",
+   "self_type" : "type-908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-306" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware27hidl_binder_death_recipientEEE"
   },
   {
@@ -27385,17 +40839,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-82"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -27405,17 +40859,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-300",
+   "self_type" : "type-300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -27425,17 +40879,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-114" ],
+   "template_args" : [ "type-504" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_015IServiceManagerEEE"
   },
   {
@@ -27445,17 +40899,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-147"
+     "referenced_type" : "type-543"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-146",
-   "self_type" : "type-146",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-148" ],
+   "template_args" : [ "type-495" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -27465,17 +40919,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-112"
+     "referenced_type" : "type-532"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-113" ],
+   "template_args" : [ "type-514" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_115IServiceManagerEEE"
   },
   {
@@ -27485,17 +40939,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback>",
    "record_kind" : "class",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-156" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IClientCallbackEEE"
   },
   {
@@ -27505,47 +40959,322 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-538"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager>",
    "record_kind" : "class",
-   "referenced_type" : "type-127",
-   "self_type" : "type-127",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-129" ],
+   "template_args" : [ "type-517" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_215IServiceManagerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
+   "name" : "android::trait_pointer<android::RefBase *>",
+   "referenced_type" : "type-3558",
+   "self_type" : "type-3558",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3557",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::String16>",
+   "name" : "android::trait_pointer<android::String16>",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3680",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3555",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3678",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3679",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3681",
+   "self_type" : "type-3681",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<const void *>",
+   "name" : "android::trait_pointer<const void *>",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<int>",
+   "name" : "android::trait_pointer<int>",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3706",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
+   "name" : "android::trait_trivial_copy<android::RefBase *>",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3551",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3550",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
+   "name" : "android::trait_trivial_copy<android::String16>",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3670",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3547",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3669",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3674",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3671",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<const void *>",
+   "name" : "android::trait_trivial_copy<const void *>",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27555,151 +41284,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-224",
+   "self_type" : "type-224",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-829",
-   "self_type" : "type-829",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase *>",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3496",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3484",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
+   "name" : "android::trait_trivial_ctor<android::String16>",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3663",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3472",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3661",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3662",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3664",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
+   "name" : "android::trait_trivial_ctor<const void *>",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-461",
+   "self_type" : "type-461",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27709,151 +41570,283 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-801",
-   "self_type" : "type-801",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase *>",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3546",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3537",
+   "self_type" : "type-3537",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
+   "name" : "android::trait_trivial_dtor<android::String16>",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3666",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3527",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3665",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3668",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3667",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
+   "name" : "android::trait_trivial_dtor<const void *>",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -27863,173 +41856,294 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-900",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-401",
+   "self_type" : "type-401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-157",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
+   "name" : "android::trait_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3554",
+   "self_type" : "type-3554",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3553",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-763" ],
+   "template_args" : [ "type-286" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-654" ],
+   "template_args" : [ "type-165" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3552",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3675",
+   "self_type" : "type-3675",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3677",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3676",
+   "self_type" : "type-3676",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-49" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<const void *>",
+   "name" : "android::trait_trivial_move<const void *>",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-916",
-   "self_type" : "type-916",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28039,147 +42153,443 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-458",
+   "self_type" : "type-458",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-723" ],
+   "template_args" : [ "type-237" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-14" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-838",
-   "self_type" : "type-838",
+   "referenced_type" : "type-387",
+   "self_type" : "type-387",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-802" ],
+   "template_args" : [ "type-336" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-759",
-   "self_type" : "type-759",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-745" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-154",
+   "self_type" : "type-154",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-556" ],
+   "template_args" : [ "type-151" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-102" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-291" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-254" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-108" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase *>",
+   "name" : "android::traits<android::RefBase *>",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3561",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
+   "name" : "android::traits<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3560",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::String16>",
+   "name" : "android::traits<android::String16>",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3684",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-286" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
+   "name" : "android::traits<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3559",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2156" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3682",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3683",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3685",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-383" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<const void *>",
+   "name" : "android::traits<const void *>",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-78" ],
+   "unique_id" : "_ZTSN7android6traitsIPKvEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::traits<int>",
+   "name" : "android::traits<int>",
+   "referenced_type" : "type-3707",
+   "self_type" : "type-3707",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android6traitsIiEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3426"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
+   "name" : "android::use_trivial_move<android::RefBase *>",
+   "referenced_type" : "type-3425",
+   "self_type" : "type-3425",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-25" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3424"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3423",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-308" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3422"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3421",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2144" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2208"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2186" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3625"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3624",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2228" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3627"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3626",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-3617" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2206"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2196" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2344"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-2281" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3688"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<int>",
+   "name" : "android::use_trivial_move<int>",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3687",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-14" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-332"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::BHwBinder>",
    "name" : "android::wp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-797",
-   "self_type" : "type-797",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-800" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28189,23 +42599,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-902"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-901",
+   "self_type" : "type-901",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-353" ],
+   "template_args" : [ "type-905" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
   },
   {
@@ -28215,23 +42625,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-2141"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::hardware::IBinder>",
+   "name" : "android::wp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-2140" ],
+   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-82"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hardware::hidl_death_recipient>",
    "name" : "android::wp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-306" ],
+   "template_args" : [ "type-83" ],
    "unique_id" : "_ZTSN7android2wpINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -28241,23 +42677,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-301"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-36"
+     "referenced_type" : "type-308"
     }
    ],
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase>",
    "name" : "android::wp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-309",
+   "self_type" : "type-309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-35" ],
+   "template_args" : [ "type-302" ],
    "unique_id" : "_ZTSN7android2wpINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28266,18 +42702,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -28288,23 +42724,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-227"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -28315,23 +42751,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-231"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-719"
+     "referenced_type" : "type-233"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -28342,48 +42778,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-716"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-228"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -28394,38 +42830,38 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-239",
+   "self_type" : "type-239",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -28436,18 +42872,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -28458,43 +42894,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-188"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-227"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-226",
+   "self_type" : "type-226",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -28504,13 +42940,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-179",
+   "self_type" : "type-179",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -28521,35 +42957,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-181"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-178"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-177"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-665"
+     "referenced_type" : "type-176"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-663"
+     "referenced_type" : "type-174"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "record_kind" : "union",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
@@ -28560,18 +42996,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -28582,43 +43018,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -28629,48 +43065,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -28681,48 +43117,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-177",
+   "self_type" : "type-177",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -28733,53 +43169,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-71"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-664"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-667",
-   "self_type" : "type-667",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -28790,31 +43226,58 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-14"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-15"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lock",
+     "referenced_type" : "type-2323"
+    },
+    {
+     "field_name" : "has_tls",
+     "field_offset" : 32,
+     "referenced_type" : "type-14"
+    },
+    {
+     "field_name" : "tls",
+     "field_offset" : 64,
+     "referenced_type" : "type-14"
+    }
+   ],
+   "linker_set_key" : "thread_store_t",
+   "name" : "thread_store_t",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
+   "size" : 12,
+   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
+   "unique_id" : "thread_store_t"
   }
  ],
  "rvalue_reference_types" :
@@ -28823,8 +43286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
    "name" : "android::hardware::Return<android::hidl::manager::V1_0::IServiceManager::Transport> &&",
-   "referenced_type" : "type-180",
-   "self_type" : "type-184",
+   "referenced_type" : "type-765",
+   "self_type" : "type-767",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28832,8 +43295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::base::V1_0::IBase> > &&",
-   "referenced_type" : "type-172",
-   "self_type" : "type-175",
+   "referenced_type" : "type-758",
+   "self_type" : "type-760",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28841,8 +43304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceManager> > &&",
-   "referenced_type" : "type-402",
-   "self_type" : "type-404",
+   "referenced_type" : "type-945",
+   "self_type" : "type-947",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28850,8 +43313,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_0::IServiceNotification> > &&",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28859,8 +43322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_1::IServiceManager> > &&",
-   "referenced_type" : "type-615",
-   "self_type" : "type-617",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28868,8 +43331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IClientCallback> > &&",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1946",
+   "self_type" : "type-1948",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28877,8 +43340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
    "name" : "android::hardware::Return<android::sp<android::hidl::manager::V1_2::IServiceManager> > &&",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28886,8 +43349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-411",
-   "self_type" : "type-737",
+   "referenced_type" : "type-249",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28895,8 +43358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-104",
-   "self_type" : "type-494",
+   "referenced_type" : "type-120",
+   "self_type" : "type-122",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28904,8 +43367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-106",
-   "self_type" : "type-414",
+   "referenced_type" : "type-103",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28913,8 +43376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::SchedPrio &&",
    "name" : "android::hardware::details::SchedPrio &&",
-   "referenced_type" : "type-38",
-   "self_type" : "type-41",
+   "referenced_type" : "type-367",
+   "self_type" : "type-669",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -28922,8 +43385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char> &&",
    "name" : "android::hardware::details::hidl_pointer<const char> &&",
-   "referenced_type" : "type-98",
-   "self_type" : "type-318",
+   "referenced_type" : "type-39",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -28931,8 +43394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-105",
-   "self_type" : "type-451",
+   "referenced_type" : "type-112",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -28940,8 +43403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-77",
-   "self_type" : "type-84",
+   "referenced_type" : "type-28",
+   "self_type" : "type-33",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28949,8 +43412,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-201",
-   "self_type" : "type-227",
+   "referenced_type" : "type-60",
+   "self_type" : "type-65",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28958,8 +43421,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_string &&",
    "name" : "android::hardware::hidl_string &&",
-   "referenced_type" : "type-97",
-   "self_type" : "type-188",
+   "referenced_type" : "type-38",
+   "self_type" : "type-55",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28967,8 +43430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<int> &&",
    "name" : "android::hardware::hidl_vec<int> &&",
-   "referenced_type" : "type-206",
-   "self_type" : "type-207",
+   "referenced_type" : "type-472",
+   "self_type" : "type-785",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28976,8 +43439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::BHwBinder> &&",
    "name" : "android::sp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-875",
-   "self_type" : "type-887",
+   "referenced_type" : "type-425",
+   "self_type" : "type-437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28985,8 +43448,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::HidlMemory> &&",
    "name" : "android::sp<android::hardware::HidlMemory> &&",
-   "referenced_type" : "type-347",
-   "self_type" : "type-377",
+   "referenced_type" : "type-93",
+   "self_type" : "type-99",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-922",
+   "self_type" : "type-2234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28994,8 +43466,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
    "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-72",
-   "self_type" : "type-886",
+   "referenced_type" : "type-383",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29003,8 +43475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_binder_death_recipient> &&",
-   "referenced_type" : "type-356",
-   "self_type" : "type-398",
+   "referenced_type" : "type-908",
+   "self_type" : "type-942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29012,8 +43484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> &&",
    "name" : "android::sp<android::hardware::hidl_death_recipient> &&",
-   "referenced_type" : "type-304",
-   "self_type" : "type-879",
+   "referenced_type" : "type-81",
+   "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29021,8 +43493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-173",
-   "self_type" : "type-958",
+   "referenced_type" : "type-300",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29030,8 +43502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceManager> &&",
-   "referenced_type" : "type-258",
-   "self_type" : "type-391",
+   "referenced_type" : "type-526",
+   "self_type" : "type-935",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29039,8 +43511,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> &&",
-   "referenced_type" : "type-146",
-   "self_type" : "type-396",
+   "referenced_type" : "type-542",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29048,8 +43520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_1::IServiceManager> &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
+   "referenced_type" : "type-531",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29057,8 +43529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IClientCallback> &&",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-548",
+   "self_type" : "type-1943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29066,8 +43538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
    "name" : "android::sp<android::hidl::manager::V1_2::IServiceManager> &&",
-   "referenced_type" : "type-127",
-   "self_type" : "type-301",
+   "referenced_type" : "type-537",
+   "self_type" : "type-869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29075,8 +43547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hardware::BHwBinder> &&",
    "name" : "android::wp<android::hardware::BHwBinder> &&",
-   "referenced_type" : "type-797",
-   "self_type" : "type-808",
+   "referenced_type" : "type-331",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29084,8 +43556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::hidl::base::V1_0::IBase> &&",
    "name" : "android::wp<android::hidl::base::V1_0::IBase> &&",
-   "referenced_type" : "type-33",
-   "self_type" : "type-40",
+   "referenced_type" : "type-309",
+   "self_type" : "type-668",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29093,8 +43565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *&&",
    "name" : "const android::hidl::base::V1_0::IBase *&&",
-   "referenced_type" : "type-795",
-   "self_type" : "type-807",
+   "referenced_type" : "type-329",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29102,8 +43574,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29111,8 +43583,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1075",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29120,8 +43592,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1686",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29129,8 +43601,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29138,8 +43610,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1853",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29147,8 +43619,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29156,8 +43628,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-491",
-   "self_type" : "type-490",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29165,8 +43637,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-577",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29174,8 +43646,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
-   "referenced_type" : "type-637",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2938",
+   "self_type" : "type-2937",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-2993",
+   "self_type" : "type-2992",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3049",
+   "self_type" : "type-3048",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3109",
+   "self_type" : "type-3108",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &&",
+   "referenced_type" : "type-3232",
+   "self_type" : "type-3231",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29183,8 +43709,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29192,8 +43718,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1626",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29201,8 +43727,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29210,8 +43736,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1747",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29219,8 +43745,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29228,8 +43754,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29237,8 +43763,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-1977",
+   "self_type" : "type-1976",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29246,8 +43772,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2050",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29255,8 +43781,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
    "name" : "std::function<sp<IBase> (void *)> &&",
-   "referenced_type" : "type-641",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2942",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-2997",
+   "self_type" : "type-2996",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3052",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3114",
+   "self_type" : "type-3113",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBase> (void *)> &&",
+   "name" : "std::function<sp<IBase> (void *)> &&",
+   "referenced_type" : "type-3236",
+   "self_type" : "type-3235",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29264,8 +43844,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29273,8 +43853,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1077",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29282,8 +43862,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1688",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29291,8 +43871,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29300,8 +43880,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1855",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29309,8 +43889,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29318,8 +43898,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1974",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29327,8 +43907,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2048",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   },
@@ -29336,8 +43916,62 @@
    "alignment" : 4,
    "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
    "name" : "std::function<sp<IBinder> (void *)> &&",
-   "referenced_type" : "type-639",
-   "self_type" : "type-638",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2940",
+   "self_type" : "type-2939",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-2995",
+   "self_type" : "type-2994",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3050",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3112",
+   "self_type" : "type-3111",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
+   "size" : 4,
+   "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::function<sp<IBinder> (void *)> &&",
+   "name" : "std::function<sp<IBinder> (void *)> &&",
+   "referenced_type" : "type-3234",
+   "self_type" : "type-3233",
    "size" : 4,
    "source_file" : "/system/libhidl/transport/include/hidl/ConcurrentMap.h"
   }
diff --git a/29/64/x86_x86_64/source-based/libhwbinder.so.lsdump b/29/64/x86_x86_64/source-based/libhwbinder.so.lsdump
deleted file mode 100644
index b1b70eb..0000000
--- a/29/64/x86_x86_64/source-based/libhwbinder.so.lsdump
+++ /dev/null
@@ -1,16791 +0,0 @@
-{
- "array_types" :
- [
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [0]",
-   "name" : "char [0]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-158",
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [10]",
-   "name" : "char [10]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-720",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [11]",
-   "name" : "char [11]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-742",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [12]",
-   "name" : "char [12]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-717",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [13]",
-   "name" : "char [13]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-713",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [14]",
-   "name" : "char [14]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-761",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [15]",
-   "name" : "char [15]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-122",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [16]",
-   "name" : "char [16]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-745",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [17]",
-   "name" : "char [17]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-764",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [18]",
-   "name" : "char [18]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-749",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [19]",
-   "name" : "char [19]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-780",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [20]",
-   "name" : "char [20]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-758",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [22]",
-   "name" : "char [22]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-783",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [25]",
-   "name" : "char [25]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-773",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [28]",
-   "name" : "char [28]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-796",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [29]",
-   "name" : "char [29]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-770",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [2]",
-   "name" : "char [2]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-723",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [31]",
-   "name" : "char [31]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-755",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [32]",
-   "name" : "char [32]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-786",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [35]",
-   "name" : "char [35]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-776",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [37]",
-   "name" : "char [37]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-767",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [3]",
-   "name" : "char [3]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-735",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [4]",
-   "name" : "char [4]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-119",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [5]",
-   "name" : "char [5]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-125",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [6]",
-   "name" : "char [6]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-727",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [7]",
-   "name" : "char [7]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-752",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [8]",
-   "name" : "char [8]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-739",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "char [9]",
-   "name" : "char [9]",
-   "referenced_type" : "type-115",
-   "self_type" : "type-730",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "float []",
-   "name" : "float []",
-   "referenced_type" : "type-95",
-   "self_type" : "type-228",
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int [0]",
-   "name" : "int [0]",
-   "referenced_type" : "type-10",
-   "self_type" : "type-84",
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "unsigned char [5121]",
-   "name" : "unsigned char [5121]",
-   "referenced_type" : "type-66",
-   "self_type" : "type-167",
-   "size" : 5121,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [8]",
-   "name" : "unsigned int [8]",
-   "referenced_type" : "type-4",
-   "self_type" : "type-216",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  }
- ],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "bool",
-   "name" : "bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "char",
-   "name" : "char",
-   "referenced_type" : "type-115",
-   "self_type" : "type-115",
-   "size" : 1
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "char16_t",
-   "name" : "char16_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
-   "size" : 2
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double",
-   "name" : "double",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
-   "size" : 8
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float",
-   "name" : "float",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "int",
-   "name" : "int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long",
-   "name" : "long",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "long long",
-   "name" : "long long",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "short",
-   "name" : "short",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
-   "size" : 2
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "signed char",
-   "name" : "signed char",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned char",
-   "name" : "unsigned char",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
-   "name" : "unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-4",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long",
-   "name" : "unsigned long",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned long long",
-   "name" : "unsigned long long",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
-   "size" : 8
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "unsigned short",
-   "name" : "unsigned short",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "void",
-   "name" : "void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC1Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderC2Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10BpHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderEPKS1_"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10IInterfaceD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware10TextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware11BpHwRefBaseD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState11getMmapSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState15startThreadPoolEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC1Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware12ProcessStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11clearCallerEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState11stopProcessEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14executeCommandEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState4selfEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState7processEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8shutdownEv"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14IPCThreadStateD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware14acquire_objectERKNS_2spINS0_12ProcessStateEEERK20binder_object_headerPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS1_INS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14flatten_binderERKNS_2spINS0_12ProcessStateEEERKNS_2wpINS0_7IBinderEEEPNS0_6ParcelE"
-  },
-  {
-   "name" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS1_INS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware16unflatten_binderERKNS_2spINS0_12ProcessStateEEERKNS0_6ParcelEPNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputC2Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware18BufferedTextOutputD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware21acquire_binder_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeFloatEf"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt16Es"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt32Ei"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeInt64Ex"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel10writeUint8Eh"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11finishWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11setDataSizeEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeDoubleEd"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI16binder_fd_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI20binder_buffer_objectEEiRKT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android8hardware6Parcel11writeObjectI22binder_fd_array_objectEEiRKT_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint16Et"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint32Ej"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel11writeUint64Ey"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12restartWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeCStringEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writeInplaceEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel12writePointerEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13continueWriteEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16EPKDsj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14acquireObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14freeDataNoInitEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14releaseObjectsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15setDataCapacityEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel5writeEPKvj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel6removeEjj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel7setDataEPKhj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8freeDataEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8growDataEj"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel8setErrorEi"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9initStateEv"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeBoolEb"
-  },
-  {
-   "name" : "_ZN7android8hardware6Parcel9writeInt8Ea"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware6ParcelD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC1EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7HexDumpC2EPKvjj"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware7IBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderC2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZN7android8hardware9BHwBinderD2Ev"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE"
-  },
-  {
-   "name" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware12ProcessState16isContextManagerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10clearCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10errorCheckEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10ipcObjectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEPd"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readDoubleEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI16binder_fd_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI20binder_buffer_objectEEPKT_Pj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android8hardware6Parcel10readObjectI22binder_fd_array_objectEEPKT_Pj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint16EPt"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32EPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64EPy"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10readUint64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel10scanForFdsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readCStringEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readInplaceEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11readPointerEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel11updateCacheEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataCapacityEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12dataPositionEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12objectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel12readString16Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel14readWeakBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel15setDataPositionEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel16readStrongBinderEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4dataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel4readEPvj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7ipcDataEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel7objectsEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8dataSizeEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEPb"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readBoolEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel8readInt8EPa"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9dataAvailEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEPf"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readFloatEv"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt16EPs"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32EPi"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt32Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64EPx"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readInt64Ev"
-  },
-  {
-   "name" : "_ZNK7android8hardware6Parcel9readUint8EPh"
-  },
-  {
-   "name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-  },
-  {
-   "name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNKSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE3strEv"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-  },
-  {
-   "name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-  },
-  {
-   "name" : "getHWBinderKernelReferences"
-  },
-  {
-   "name" : "printHexData"
-  },
-  {
-   "name" : "printTypeCode"
-  },
-  {
-   "name" : "stringForIndent"
-  }
- ],
- "elf_objects" :
- [
-  {
-   "name" : "_ZN7android8hardware12gTextBuffersE"
-  },
-  {
-   "name" : "_ZN7android8hardware13gProcessMutexE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aerrE"
-  },
-  {
-   "name" : "_ZN7android8hardware4alogE"
-  },
-  {
-   "name" : "_ZN7android8hardware4aoutE"
-  },
-  {
-   "name" : "_ZN7android8hardware8gProcessE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware10BpHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCN7android8hardware10PoolThreadE0_NS_6ThreadE"
-  },
-  {
-   "name" : "_ZTCN7android8hardware9BHwBinderE0_NS0_7IBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware10IInterfaceE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware12ProcessStateE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTTN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_7RefBaseEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android6VectorIiEE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10BpHwBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10IInterfaceE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware10PoolThreadE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware10TextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware11BpHwRefBaseE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware12FdTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware12ProcessStateE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware13LogTextOutputE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVN7android8hardware18BufferedTextOutput11BufferStateE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware18BufferedTextOutputE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware7IBinderE"
-  },
-  {
-   "name" : "_ZTVN7android8hardware9BHwBinderE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  }
- ],
- "enum_types" :
- [
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::Condition::WAKE_UP_ONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Condition::WAKE_UP_ALL"
-    }
-   ],
-   "linker_set_key" : "android::Condition::WakeUpType",
-   "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String16::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String16::StaticLinkage",
-   "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::String8::kEmptyString"
-    }
-   ],
-   "linker_set_key" : "android::String8::StaticLinkage",
-   "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTSN7android7String813StaticLinkageE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
-   "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-10",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "ANDROID_LOG_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "ANDROID_LOG_DEFAULT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "ANDROID_LOG_VERBOSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "ANDROID_LOG_DEBUG"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "ANDROID_LOG_INFO"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "ANDROID_LOG_WARN"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "ANDROID_LOG_ERROR"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "ANDROID_LOG_FATAL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "ANDROID_LOG_SILENT"
-    }
-   ],
-   "linker_set_key" : "android_LogPriority",
-   "name" : "android_LogPriority",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_LogPriority"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_MODE_NATIVE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_MODE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_MODE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_COLOR_MODE_SRGB"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "HAL_COLOR_MODE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "HAL_COLOR_MODE_DISPLAY_P3"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_t",
-   "name" : "android_color_mode_t",
-   "referenced_type" : "type-194",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 10,
-     "name" : "HAL_COLOR_MODE_BT2020"
-    },
-    {
-     "enum_field_value" : 11,
-     "name" : "HAL_COLOR_MODE_BT2100_PQ"
-    },
-    {
-     "enum_field_value" : 12,
-     "name" : "HAL_COLOR_MODE_BT2100_HLG"
-    }
-   ],
-   "linker_set_key" : "android_color_mode_v1_1_t",
-   "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_mode_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_COLOR_TRANSFORM_IDENTITY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_COLOR_TRANSFORM_ARBITRARY_MATRIX"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_COLOR_TRANSFORM_VALUE_INVERSE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_COLOR_TRANSFORM_GRAYSCALE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_PROTANOPIA"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_DEUTERANOPIA"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA"
-    }
-   ],
-   "linker_set_key" : "android_color_transform_t",
-   "name" : "android_color_transform_t",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_color_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_UNKNOWN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_DATASPACE_ARBITRARY"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_DATASPACE_STANDARD_SHIFT"
-    },
-    {
-     "enum_field_value" : 4128768,
-     "name" : "HAL_DATASPACE_STANDARD_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_STANDARD_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "HAL_DATASPACE_STANDARD_BT709"
-    },
-    {
-     "enum_field_value" : 131072,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625"
-    },
-    {
-     "enum_field_value" : 196608,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 262144,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525"
-    },
-    {
-     "enum_field_value" : 327680,
-     "name" : "HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED"
-    },
-    {
-     "enum_field_value" : 393216,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020"
-    },
-    {
-     "enum_field_value" : 458752,
-     "name" : "HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE"
-    },
-    {
-     "enum_field_value" : 524288,
-     "name" : "HAL_DATASPACE_STANDARD_BT470M"
-    },
-    {
-     "enum_field_value" : 589824,
-     "name" : "HAL_DATASPACE_STANDARD_FILM"
-    },
-    {
-     "enum_field_value" : 655360,
-     "name" : "HAL_DATASPACE_STANDARD_DCI_P3"
-    },
-    {
-     "enum_field_value" : 720896,
-     "name" : "HAL_DATASPACE_STANDARD_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_DATASPACE_TRANSFER_SHIFT"
-    },
-    {
-     "enum_field_value" : 130023424,
-     "name" : "HAL_DATASPACE_TRANSFER_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_TRANSFER_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 4194304,
-     "name" : "HAL_DATASPACE_TRANSFER_LINEAR"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "HAL_DATASPACE_TRANSFER_SRGB"
-    },
-    {
-     "enum_field_value" : 12582912,
-     "name" : "HAL_DATASPACE_TRANSFER_SMPTE_170M"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_2"
-    },
-    {
-     "enum_field_value" : 20971520,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_6"
-    },
-    {
-     "enum_field_value" : 25165824,
-     "name" : "HAL_DATASPACE_TRANSFER_GAMMA2_8"
-    },
-    {
-     "enum_field_value" : 29360128,
-     "name" : "HAL_DATASPACE_TRANSFER_ST2084"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "HAL_DATASPACE_TRANSFER_HLG"
-    },
-    {
-     "enum_field_value" : 27,
-     "name" : "HAL_DATASPACE_RANGE_SHIFT"
-    },
-    {
-     "enum_field_value" : 939524096,
-     "name" : "HAL_DATASPACE_RANGE_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_DATASPACE_RANGE_UNSPECIFIED"
-    },
-    {
-     "enum_field_value" : 134217728,
-     "name" : "HAL_DATASPACE_RANGE_FULL"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "HAL_DATASPACE_RANGE_LIMITED"
-    },
-    {
-     "enum_field_value" : 402653184,
-     "name" : "HAL_DATASPACE_RANGE_EXTENDED"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "HAL_DATASPACE_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 138477568,
-     "name" : "HAL_DATASPACE_V0_SRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 406913024,
-     "name" : "HAL_DATASPACE_V0_SCRGB_LINEAR"
-    },
-    {
-     "enum_field_value" : 513,
-     "name" : "HAL_DATASPACE_SRGB"
-    },
-    {
-     "enum_field_value" : 142671872,
-     "name" : "HAL_DATASPACE_V0_SRGB"
-    },
-    {
-     "enum_field_value" : 411107328,
-     "name" : "HAL_DATASPACE_V0_SCRGB"
-    },
-    {
-     "enum_field_value" : 257,
-     "name" : "HAL_DATASPACE_JFIF"
-    },
-    {
-     "enum_field_value" : 146931712,
-     "name" : "HAL_DATASPACE_V0_JFIF"
-    },
-    {
-     "enum_field_value" : 258,
-     "name" : "HAL_DATASPACE_BT601_625"
-    },
-    {
-     "enum_field_value" : 281149440,
-     "name" : "HAL_DATASPACE_V0_BT601_625"
-    },
-    {
-     "enum_field_value" : 259,
-     "name" : "HAL_DATASPACE_BT601_525"
-    },
-    {
-     "enum_field_value" : 281280512,
-     "name" : "HAL_DATASPACE_V0_BT601_525"
-    },
-    {
-     "enum_field_value" : 260,
-     "name" : "HAL_DATASPACE_BT709"
-    },
-    {
-     "enum_field_value" : 281083904,
-     "name" : "HAL_DATASPACE_V0_BT709"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DCI_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 155844608,
-     "name" : "HAL_DATASPACE_DCI_P3"
-    },
-    {
-     "enum_field_value" : 139067392,
-     "name" : "HAL_DATASPACE_DISPLAY_P3_LINEAR"
-    },
-    {
-     "enum_field_value" : 143261696,
-     "name" : "HAL_DATASPACE_DISPLAY_P3"
-    },
-    {
-     "enum_field_value" : 151715840,
-     "name" : "HAL_DATASPACE_ADOBE_RGB"
-    },
-    {
-     "enum_field_value" : 138805248,
-     "name" : "HAL_DATASPACE_BT2020_LINEAR"
-    },
-    {
-     "enum_field_value" : 147193856,
-     "name" : "HAL_DATASPACE_BT2020"
-    },
-    {
-     "enum_field_value" : 163971072,
-     "name" : "HAL_DATASPACE_BT2020_PQ"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "HAL_DATASPACE_DEPTH"
-    },
-    {
-     "enum_field_value" : 4097,
-     "name" : "HAL_DATASPACE_SENSOR"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_t",
-   "name" : "android_dataspace_t",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 281411584,
-     "name" : "HAL_DATASPACE_BT2020_ITU"
-    },
-    {
-     "enum_field_value" : 298188800,
-     "name" : "HAL_DATASPACE_BT2020_ITU_PQ"
-    },
-    {
-     "enum_field_value" : 302383104,
-     "name" : "HAL_DATASPACE_BT2020_ITU_HLG"
-    },
-    {
-     "enum_field_value" : 168165376,
-     "name" : "HAL_DATASPACE_BT2020_HLG"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_1_t",
-   "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 142999552,
-     "name" : "HAL_DATASPACE_DISPLAY_BT2020"
-    },
-    {
-     "enum_field_value" : 4098,
-     "name" : "HAL_DATASPACE_DYNAMIC_DEPTH"
-    },
-    {
-     "enum_field_value" : 4099,
-     "name" : "HAL_DATASPACE_JPEG_APP_SEGMENTS"
-    },
-    {
-     "enum_field_value" : 4100,
-     "name" : "HAL_DATASPACE_HEIF"
-    }
-   ],
-   "linker_set_key" : "android_dataspace_v1_2_t",
-   "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_dataspace_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_COMPONENT_Y"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "FLEX_COMPONENT_Cb"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "FLEX_COMPONENT_Cr"
-    },
-    {
-     "enum_field_value" : 1024,
-     "name" : "FLEX_COMPONENT_R"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "FLEX_COMPONENT_G"
-    },
-    {
-     "enum_field_value" : 4096,
-     "name" : "FLEX_COMPONENT_B"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "FLEX_COMPONENT_A"
-    }
-   ],
-   "linker_set_key" : "android_flex_component",
-   "name" : "android_flex_component",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_component"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "FLEX_FORMAT_INVALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "FLEX_FORMAT_Y"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "FLEX_FORMAT_YCbCr"
-    },
-    {
-     "enum_field_value" : 1073741831,
-     "name" : "FLEX_FORMAT_YCbCrA"
-    },
-    {
-     "enum_field_value" : 7168,
-     "name" : "FLEX_FORMAT_RGB"
-    },
-    {
-     "enum_field_value" : 1073748992,
-     "name" : "FLEX_FORMAT_RGBA"
-    }
-   ],
-   "linker_set_key" : "android_flex_format",
-   "name" : "android_flex_format",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_flex_format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_HDR_DOLBY_VISION"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_HDR_HDR10"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_HDR_HLG"
-    }
-   ],
-   "linker_set_key" : "android_hdr_t",
-   "name" : "android_hdr_t",
-   "referenced_type" : "type-199",
-   "self_type" : "type-199",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_HDR_HDR10_PLUS"
-    }
-   ],
-   "linker_set_key" : "android_hdr_v1_2_t",
-   "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_hdr_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 39,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_888"
-    },
-    {
-     "enum_field_value" : 40,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_444_888"
-    },
-    {
-     "enum_field_value" : 41,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGB_888"
-    },
-    {
-     "enum_field_value" : 42,
-     "name" : "HAL_PIXEL_FORMAT_FLEX_RGBA_8888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_sw_t",
-   "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-214",
-   "self_type" : "type-214",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "_ZTS25android_pixel_format_sw_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_8888"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_PIXEL_FORMAT_RGBX_8888"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_PIXEL_FORMAT_RGB_888"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_PIXEL_FORMAT_RGB_565"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "HAL_PIXEL_FORMAT_BGRA_8888"
-    },
-    {
-     "enum_field_value" : 16,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_SP"
-    },
-    {
-     "enum_field_value" : 17,
-     "name" : "HAL_PIXEL_FORMAT_YCRCB_420_SP"
-    },
-    {
-     "enum_field_value" : 20,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_422_I"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_FP16"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "HAL_PIXEL_FORMAT_RAW16"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "HAL_PIXEL_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 34,
-     "name" : "HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_420_888"
-    },
-    {
-     "enum_field_value" : 36,
-     "name" : "HAL_PIXEL_FORMAT_RAW_OPAQUE"
-    },
-    {
-     "enum_field_value" : 37,
-     "name" : "HAL_PIXEL_FORMAT_RAW10"
-    },
-    {
-     "enum_field_value" : 38,
-     "name" : "HAL_PIXEL_FORMAT_RAW12"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "HAL_PIXEL_FORMAT_RGBA_1010102"
-    },
-    {
-     "enum_field_value" : 538982489,
-     "name" : "HAL_PIXEL_FORMAT_Y8"
-    },
-    {
-     "enum_field_value" : 540422489,
-     "name" : "HAL_PIXEL_FORMAT_Y16"
-    },
-    {
-     "enum_field_value" : 842094169,
-     "name" : "HAL_PIXEL_FORMAT_YV12"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_t",
-   "name" : "android_pixel_format_t",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 48,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_16"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "HAL_PIXEL_FORMAT_STENCIL_8"
-    },
-    {
-     "enum_field_value" : 54,
-     "name" : "HAL_PIXEL_FORMAT_YCBCR_P010"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_1_t",
-   "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 55,
-     "name" : "HAL_PIXEL_FORMAT_HSV_888"
-    }
-   ],
-   "linker_set_key" : "android_pixel_format_v1_2_t",
-   "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_pixel_format_v1_2_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "HAL_RENDER_INTENT_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_RENDER_INTENT_ENHANCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_COLORIMETRIC"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_RENDER_INTENT_TONE_MAP_ENHANCE"
-    }
-   ],
-   "linker_set_key" : "android_render_intent_v1_1_t",
-   "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_render_intent_v1_1_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 1,
-     "name" : "HAL_TRANSFORM_FLIP_H"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "HAL_TRANSFORM_FLIP_V"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "HAL_TRANSFORM_ROT_90"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "HAL_TRANSFORM_ROT_180"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "HAL_TRANSFORM_ROT_270"
-    }
-   ],
-   "linker_set_key" : "android_transform_t",
-   "name" : "android_transform_t",
-   "referenced_type" : "type-187",
-   "self_type" : "type-187",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "android_transform_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MIN"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "LOG_ID_MAIN"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "LOG_ID_RADIO"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "LOG_ID_EVENTS"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "LOG_ID_SYSTEM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "LOG_ID_CRASH"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "LOG_ID_STATS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "LOG_ID_SECURITY"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "LOG_ID_KERNEL"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "LOG_ID_MAX"
-    }
-   ],
-   "linker_set_key" : "log_id",
-   "name" : "log_id",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-4",
-   "unique_id" : "log_id"
-  }
- ],
- "function_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(android::hardware::TextOutput &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    }
-   ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-580",
-   "self_type" : "type-584",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-144"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-372",
-   "return_type" : "type-38",
-   "self_type" : "type-372",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (void *)",
-   "name" : "int (void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-235",
-   "return_type" : "type-10",
-   "self_type" : "type-235",
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(std::__1::basic_ostream<char> &)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-592"
-    }
-   ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-592",
-   "self_type" : "type-591",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-70",
-   "return_type" : "type-13",
-   "self_type" : "type-70",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (const void *, void *, void *)",
-   "name" : "void (const void *, void *, void *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "referenced_type" : "type-280",
-   "return_type" : "type-13",
-   "self_type" : "type-280",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (void *, const char *)",
-   "name" : "void (void *, const char *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "referenced_type" : "type-648",
-   "return_type" : "type-13",
-   "self_type" : "type-648",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "functions" :
- [
-  {
-   "function_name" : "android::sp<android::hardware::ProcessState>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware12ProcessStateEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-543"
-    },
-    {
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-365",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-658"
-    },
-    {
-     "referenced_type" : "type-50"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::sp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-658"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-52",
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "function_name" : "android::wp<android::hardware::IBinder>::operator=",
-   "linker_set_key" : "_ZN7android2wpINS_8hardware7IBinderEEaSEPS2_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-478"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-48",
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-507"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-650",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::sendObituary",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder12sendObituaryEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::kill",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager4killEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::attach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6attachEPKvPvS5_PFvS4_S5_S5_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::detach",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManager6detachEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::~ObjectManager",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13ObjectManagerD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-529"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BpHwBinder::reportOneDeath",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder14reportOneDeathERKNS1_8ObituaryE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-517"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::getNodeStrongRefCount",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder21getNodeStrongRefCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-818"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC1Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderC2Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::~BpHwBinder",
-   "linker_set_key" : "_ZN7android8hardware10BpHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderEPKS1_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-661"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::asBinder",
-   "linker_set_key" : "_ZN7android8hardware10IInterface8asBinderERKNS_2spIS1_EE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-654"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::IInterface::IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IInterface::~IInterface",
-   "linker_set_key" : "_ZN7android8hardware10IInterfaceD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-657"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::TextOutput::~TextOutput",
-   "linker_set_key" : "_ZN7android8hardware10TextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-439"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC1ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseC2ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::~BpHwRefBase",
-   "linker_set_key" : "_ZN7android8hardware11BpHwRefBaseD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState10selfOrNullEv",
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState11getMmapSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getMaxThreads",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState13getMaxThreadsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::startThreadPool",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState15startThreadPoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16getContextObjectERKNS_8String16ERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-373"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::initWithMmapSize",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16initWithMmapSizeEj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setContextObject",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState16setContextObjectERKNS_2spINS0_7IBinderEEERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-144"
-    },
-    {
-     "referenced_type" : "type-373"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::spawnPooledThread",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState17spawnPooledThreadEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::giveThreadPoolName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18giveThreadPoolNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::lookupHandleLocked",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18lookupHandleLockedEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-318",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setCallRestriction",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState18setCallRestrictionENS1_15CallRestrictionE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-378"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getKernelReferences",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState19getKernelReferencesEjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::becomeContextManager",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20becomeContextManagerEPFbRKNS_8String16ERKNS_2spINS0_7IBinderEEEPvESA_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-371"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::makeBinderThreadName",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState20makeBinderThreadNameEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-375",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getWeakProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState21getWeakProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-32",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongProxyForHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState23getStrongProxyForHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::setThreadPoolConfiguration",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState26setThreadPoolConfigurationEjb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::getStrongRefCountForNodeByHandle",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState32getStrongRefCountForNodeByHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::self",
-   "linker_set_key" : "_ZN7android8hardware12ProcessState4selfEv",
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC1Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::ProcessState::~ProcessState",
-   "linker_set_key" : "_ZN7android8hardware12ProcessStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-367"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::freeBuffer",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10freeBufferEPNS0_6ParcelEPKhjPKyjPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::selfOrNull",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState10selfOrNullEv",
-   "return_type" : "type-701",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::clearCaller",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11clearCallerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::stopProcess",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState11stopProcessEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setupPolling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState12setupPollingEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-705"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13decWeakHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::expungeHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13expungeHandleEiPNS0_7IBinderE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::flushCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13flushCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incWeakHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState13incWeakHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearLastError",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14clearLastErrorEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::executeCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14executeCommandEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isLooperThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14isLooperThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::joinThreadPool",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14joinThreadPoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::talkWithDriver",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState14talkWithDriverEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::decStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15decStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::incStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15incStrongHandleEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::waitForResponse",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState15waitForResponseEPNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-705"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::addPostCommandTask",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18addPostCommandTaskERKNSt3__18functionIFvvEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-708"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isOnlyBinderThread",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState18isOnlyBinderThreadEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setStrictModePolicy",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setStrictModePolicyEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setTheContextObject",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState19setTheContextObjectENS_2spINS0_9BHwBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-538"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20clearCallingIdentityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-93",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::getAndExecuteCommand",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20getAndExecuteCommandEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::handlePolledCommands",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20handlePolledCommandsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPendingDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20processPendingDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::writeTransactionData",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState20writeTransactionDataEijijRKNS0_6ParcelEPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-705"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::attemptIncStrongHandle",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22attemptIncStrongHandleEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::clearDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22clearDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::processPostWriteDerefs",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22processPostWriteDerefsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::restoreCallingIdentity",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState22restoreCallingIdentityEx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::requestDeathNotification",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState24requestDeathNotificationEiPNS0_10BpHwBinderE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::blockUntilThreadAvailable",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState25blockUntilThreadAvailableEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::disableBackgroundScheduling",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState27disableBackgroundSchedulingEb",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::setLastTransactionBinderFlags",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState29setLastTransactionBinderFlagsEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::self",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState4selfEv",
-   "return_type" : "type-701",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::process",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState7processEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-366",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::shutdown",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8shutdownEv",
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::transact",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState8transactEijRKNS0_6ParcelEPS2_j",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::sendReply",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadState9sendReplyERKNS0_6ParcelEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::IPCThreadState::~IPCThreadState",
-   "linker_set_key" : "_ZN7android8hardware14IPCThreadStateD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-701"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::release_object",
-   "linker_set_key" : "_ZN7android8hardware14release_objectERKNS_2spINS0_12ProcessStateEEERK18flat_binder_objectPKv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-680"
-    },
-    {
-     "referenced_type" : "type-81"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::moveIndent",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::pushBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getThreadState",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput14getThreadStateEv",
-   "return_type" : "type-608",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::threadDestructor",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput16threadDestructorEPv",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::print",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "referenced_type" : "type-376"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::popBundle",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputC2Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BufferedTextOutput::~BufferedTextOutput",
-   "linker_set_key" : "_ZN7android8hardware18BufferedTextOutputD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-607"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeFloat",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeFloatEf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-95"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt16Es",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-89"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt32Ei",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeInt64Ex",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-93"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel10writeUint8Eh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-66"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::finishWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11finishWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11setDataSizeEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeBufferEPKvjPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeDouble",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeDoubleEd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-97"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeObject",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeObjectI18flat_binder_objectEEiRKT_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-81"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-819" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint16Et",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-91"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint32",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint32Ej",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUint64",
-   "linker_set_key" : "_ZN7android8hardware6Parcel11writeUint64Ey",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-68"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::restartWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12restartWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeCString",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeCStringEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInplace",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writeInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::writePointer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel12writePointerEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::continueWrite",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13continueWriteEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16EPKDsj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-282"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-373"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeString16",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeString16ERKNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-78"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeUnpadded",
-   "linker_set_key" : "_ZN7android8hardware6Parcel13writeUnpaddedEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::acquireObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14acquireObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::freeDataNoInit",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14freeDataNoInitEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::releaseObjects",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14releaseObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel14writeReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataCapacity",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15setDataCapacityEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeWeakBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel15writeWeakBinderERKNS_2wpINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-44"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeStrongBinder",
-   "linker_set_key" : "_ZN7android8hardware6Parcel17writeStrongBinderERKNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-144"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocSize",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18getGlobalAllocSizeEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel18writeNullReferenceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::getGlobalAllocCount",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19getGlobalAllocCountEv",
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcSetDataReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19ipcSetDataReferenceEPKhjPKyjPFvPS1_S3_jS5_jPvES7_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-74"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedBuffer",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeEmbeddedBufferEPKvjPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInterfaceToken",
-   "linker_set_key" : "_ZN7android8hardware6Parcel19writeInterfaceTokenEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::closeFileDescriptors",
-   "linker_set_key" : "_ZN7android8hardware6Parcel20closeFileDescriptorsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::incrementNumReferences",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22incrementNumReferencesEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeEmbeddedReferenceEPjjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeNativeHandleNoDup",
-   "linker_set_key" : "_ZN7android8hardware6Parcel22writeNativeHandleNoDupEPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNativeHandle",
-   "linker_set_key" : "_ZN7android8hardware6Parcel25writeEmbeddedNativeHandleEPK13native_handlejj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeEmbeddedNullReference",
-   "linker_set_key" : "_ZN7android8hardware6Parcel26writeEmbeddedNullReferenceEPjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::write",
-   "linker_set_key" : "_ZN7android8hardware6Parcel5writeEPKvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::remove",
-   "linker_set_key" : "_ZN7android8hardware6Parcel6removeEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel7setDataEPKhj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::freeData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8freeDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::growData",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8growDataEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setError",
-   "linker_set_key" : "_ZN7android8hardware6Parcel8setErrorEi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::initState",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9initStateEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeBool",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeBoolEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::writeInt8",
-   "linker_set_key" : "_ZN7android8hardware6Parcel9writeInt8Ea",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-87"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::~Parcel",
-   "linker_set_key" : "_ZN7android8hardware6ParcelD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-71"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC1EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-588"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::HexDump::HexDump",
-   "linker_set_key" : "_ZN7android8hardware7HexDumpC2EPKvjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-588"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-8",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::remoteBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinder12remoteBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-650",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::IBinder::~IBinder",
-   "linker_set_key" : "_ZN7android8hardware7IBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-33"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::onTransact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-820"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::linkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-30"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::localBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder11localBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-8",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::attachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-279"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::detachObject",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::unlinkToDeath",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-109"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-112"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::isRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder15isRequestingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::setRequestingSid",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder16setRequestingSidEb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-38"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BHwBinder::getOrCreateExtras",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder17getOrCreateExtrasEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-130",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPolicy",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder22getMinSchedulingPolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::getMinSchedulingPriority",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder24getMinSchedulingPriorityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::transact",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-802"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-821"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderC2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD0Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD1Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BHwBinder::~BHwBinder",
-   "linker_set_key" : "_ZN7android8hardware9BHwBinderD2Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_7HexDumpE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "referenced_type" : "type-446"
-    }
-   ],
-   "return_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::operator<<",
-   "linker_set_key" : "_ZN7android8hardwarelsERNS0_10TextOutputERKNS0_8TypeCodeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "referenced_type" : "type-443"
-    }
-   ],
-   "return_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-285"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BpHwBinder::ObjectManager::find",
-   "linker_set_key" : "_ZNK7android8hardware10BpHwBinder13ObjectManager4findEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-531"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::ProcessState::isContextManager",
-   "linker_set_key" : "_ZNK7android8hardware12ProcessState16isContextManagerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-385"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingPid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingPidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingSid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingSidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getCallingUid",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13getCallingUidEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::isServingCall",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState13isServingCallEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getStrictModePolicy",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState19getStrictModePolicyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "function_name" : "android::hardware::IPCThreadState::getLastTransactionBinderFlags",
-   "linker_set_key" : "_ZNK7android8hardware14IPCThreadState29getLastTransactionBinderFlagsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-704"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::BufferedTextOutput::getBuffer",
-   "linker_set_key" : "_ZNK7android8hardware18BufferedTextOutput9getBufferEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-612"
-    }
-   ],
-   "return_type" : "type-575",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::clearCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10clearCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::errorCheck",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10errorCheckEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::findBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10findBufferEPKvjPbPjS5_",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-98"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10ipcObjectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readBufferEjPjjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEPd",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-96"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readDouble",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readDoubleEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-97",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readObjectI18flat_binder_objectEEPKT_Pj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-101",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "template_args" : [ "type-823" ]
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint16EPt",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-90"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32EPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64EPy",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-67"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10readUint64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-68",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::scanForFds",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel10scanForFdsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcDataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11ipcDataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readCString",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readCStringEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readInplaceEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-103",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readPointer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11readPointerEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::updateCache",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel11updateCacheEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataCapacity",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataCapacityEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12dataPositionEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::objectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12objectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNS_8String16E",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-634"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16EPNSt3__110unique_ptrINS_8String16ENS2_14default_deleteIS4_EEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-99"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel12readString16Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-281",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcBufferSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13ipcBufferSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel13readReferenceEPPKvPjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readWeakBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel14readWeakBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-32",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcObjectsCount",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15ipcObjectsCountEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::quickFindBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15quickFindBufferEPKvPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::setDataPosition",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel15setDataPositionEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::enforceInterface",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16enforceInterfaceEPKc",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-376"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-658"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel16readStrongBinderEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-51",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18readNullableBufferEjPjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::verifyBufferObject",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel18verifyBufferObjectEPK20binder_buffer_objectjjjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-108"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readString16Inplace",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19readString16InplaceEPj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-282",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferChild",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel19validateBufferChildEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::validateBufferParent",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel20validateBufferParentEjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedReference",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readEmbeddedReferenceEPPKvPjjjPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-102"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel21readNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableStrongBinder",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel24readNullableStrongBinderEPNS_2spINS0_7IBinderEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-658"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedBuffer",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel26readNullableEmbeddedBufferEjPjjjPPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-102"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::readNullableNativeHandleNoDup",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel29readNullableNativeHandleNoDupEPPK13native_handlebjj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-105"
-    },
-    {
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readNullableEmbeddedNativeHandle",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel32readNullableEmbeddedNativeHandleEjjPPK13native_handle",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-105"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::data",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4dataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-72",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::read",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel4readEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-12"
-    },
-    {
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::print",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel5printERNS0_10TextOutputEj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-580"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::ipcData",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7ipcDataEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "access" : "private",
-   "function_name" : "android::hardware::Parcel::objects",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel7objectsEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-74",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataSize",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8dataSizeEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEPb",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-98"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readBool",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readBoolEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel8readInt8EPa",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-86"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::dataAvail",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9dataAvailEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-4",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEPf",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-94"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readFloat",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readFloatEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-95",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt16",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt16EPs",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-88"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32EPi",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-705"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt32",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt32Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64EPx",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-92"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readInt64",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readInt64Ev",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    }
-   ],
-   "return_type" : "type-93",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::Parcel::readUint8",
-   "linker_set_key" : "_ZNK7android8hardware6Parcel9readUint8EPh",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-61"
-    },
-    {
-     "referenced_type" : "type-65"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "function_name" : "android::hardware::IBinder::checkSubclass",
-   "linker_set_key" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-640"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "function_name" : "android::hardware::BHwBinder::findObject",
-   "linker_set_key" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-127"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-12",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onFirstRef",
-   "linker_set_key" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onLastStrongRef",
-   "linker_set_key" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwBinder::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-650"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "access" : "protected",
-   "function_name" : "android::hardware::BpHwRefBase::onIncStrongAttempted",
-   "linker_set_key" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-140"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-103"
-    }
-   ],
-   "return_type" : "type-38",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "function_name" : "android::hardware::getHWBinderKernelReferences",
-   "linker_set_key" : "getHWBinderKernelReferences",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "referenced_type" : "type-644"
-    }
-   ],
-   "return_type" : "type-10",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printHexData",
-   "linker_set_key" : "printHexData",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    },
-    {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-10"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-38"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::printTypeCode",
-   "linker_set_key" : "printTypeCode",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-4"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-649"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "return_type" : "type-13",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "function_name" : "android::hardware::stringForIndent",
-   "linker_set_key" : "stringForIndent",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "return_type" : "type-376",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  }
- ],
- "global_vars" :
- [
-  {
-   "linker_set_key" : "_ZN7android8hardware12gTextBuffersE",
-   "name" : "android::hardware::gTextBuffers",
-   "referenced_type" : "type-615",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware13gProcessMutexE",
-   "name" : "android::hardware::gProcessMutex",
-   "referenced_type" : "type-242",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aerrE",
-   "name" : "android::hardware::aerr",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4alogE",
-   "name" : "android::hardware::alog",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware4aoutE",
-   "name" : "android::hardware::aout",
-   "referenced_type" : "type-580",
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "linker_set_key" : "_ZN7android8hardware8gProcessE",
-   "name" : "android::hardware::gProcess",
-   "referenced_type" : "type-824",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Static.h"
-  }
- ],
- "lvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex &",
-   "name" : "android::Mutex &",
-   "referenced_type" : "type-39",
-   "self_type" : "type-242",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock &",
-   "name" : "android::RWLock &",
-   "referenced_type" : "type-253",
-   "self_type" : "type-257",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const &",
-   "name" : "android::RefBase *const &",
-   "referenced_type" : "type-669",
-   "self_type" : "type-692",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const &",
-   "name" : "android::RefBase::weakref_type *const &",
-   "referenced_type" : "type-667",
-   "self_type" : "type-688",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 &",
-   "name" : "android::String16 &",
-   "referenced_type" : "type-281",
-   "self_type" : "type-627",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 &",
-   "name" : "android::String8 &",
-   "referenced_type" : "type-375",
-   "self_type" : "type-561",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const &",
-   "name" : "android::hardware::BHwBinder *const &",
-   "referenced_type" : "type-665",
-   "self_type" : "type-684",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump &",
-   "name" : "android::hardware::HexDump &",
-   "referenced_type" : "type-448",
-   "self_type" : "type-589",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry &",
-   "name" : "android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-319",
-   "self_type" : "type-352",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-381",
-   "self_type" : "type-380",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-440",
-   "self_type" : "type-580",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &",
-   "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-534",
-   "self_type" : "type-533",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-315",
-   "self_type" : "type-329",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> &",
-   "name" : "android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-538",
-   "self_type" : "type-698",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-574",
-   "self_type" : "type-599",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &",
-   "name" : "android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-51",
-   "self_type" : "type-52",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> &",
-   "name" : "android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-366",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-58",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> &",
-   "name" : "android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-32",
-   "self_type" : "type-48",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *const &",
-   "name" : "char *const &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-116",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[10]",
-   "name" : "char const (&)[10]",
-   "referenced_type" : "type-719",
-   "self_type" : "type-721",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[11]",
-   "name" : "char const (&)[11]",
-   "referenced_type" : "type-741",
-   "self_type" : "type-743",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[12]",
-   "name" : "char const (&)[12]",
-   "referenced_type" : "type-716",
-   "self_type" : "type-718",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[13]",
-   "name" : "char const (&)[13]",
-   "referenced_type" : "type-712",
-   "self_type" : "type-715",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[14]",
-   "name" : "char const (&)[14]",
-   "referenced_type" : "type-760",
-   "self_type" : "type-762",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[15]",
-   "name" : "char const (&)[15]",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[16]",
-   "name" : "char const (&)[16]",
-   "referenced_type" : "type-744",
-   "self_type" : "type-746",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[17]",
-   "name" : "char const (&)[17]",
-   "referenced_type" : "type-763",
-   "self_type" : "type-765",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[18]",
-   "name" : "char const (&)[18]",
-   "referenced_type" : "type-748",
-   "self_type" : "type-750",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[19]",
-   "name" : "char const (&)[19]",
-   "referenced_type" : "type-779",
-   "self_type" : "type-781",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[20]",
-   "name" : "char const (&)[20]",
-   "referenced_type" : "type-757",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[22]",
-   "name" : "char const (&)[22]",
-   "referenced_type" : "type-782",
-   "self_type" : "type-784",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[25]",
-   "name" : "char const (&)[25]",
-   "referenced_type" : "type-772",
-   "self_type" : "type-774",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[28]",
-   "name" : "char const (&)[28]",
-   "referenced_type" : "type-795",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[29]",
-   "name" : "char const (&)[29]",
-   "referenced_type" : "type-769",
-   "self_type" : "type-771",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[2]",
-   "name" : "char const (&)[2]",
-   "referenced_type" : "type-722",
-   "self_type" : "type-724",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[31]",
-   "name" : "char const (&)[31]",
-   "referenced_type" : "type-754",
-   "self_type" : "type-756",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[32]",
-   "name" : "char const (&)[32]",
-   "referenced_type" : "type-785",
-   "self_type" : "type-787",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[35]",
-   "name" : "char const (&)[35]",
-   "referenced_type" : "type-775",
-   "self_type" : "type-777",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[37]",
-   "name" : "char const (&)[37]",
-   "referenced_type" : "type-766",
-   "self_type" : "type-768",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[3]",
-   "name" : "char const (&)[3]",
-   "referenced_type" : "type-734",
-   "self_type" : "type-737",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[4]",
-   "name" : "char const (&)[4]",
-   "referenced_type" : "type-118",
-   "self_type" : "type-120",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[5]",
-   "name" : "char const (&)[5]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-126",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[6]",
-   "name" : "char const (&)[6]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-728",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[7]",
-   "name" : "char const (&)[7]",
-   "referenced_type" : "type-751",
-   "self_type" : "type-753",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[8]",
-   "name" : "char const (&)[8]",
-   "referenced_type" : "type-738",
-   "self_type" : "type-740",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char const (&)[9]",
-   "name" : "char const (&)[9]",
-   "referenced_type" : "type-729",
-   "self_type" : "type-731",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 &",
-   "name" : "const android::String16 &",
-   "referenced_type" : "type-374",
-   "self_type" : "type-373",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 &",
-   "name" : "const android::String8 &",
-   "referenced_type" : "type-535",
-   "self_type" : "type-550",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary &",
-   "name" : "const android::hardware::BpHwBinder::Obituary &",
-   "referenced_type" : "type-487",
-   "self_type" : "type-517",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t &",
-   "referenced_type" : "type-494",
-   "self_type" : "type-495",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump &",
-   "name" : "const android::hardware::HexDump &",
-   "referenced_type" : "type-447",
-   "self_type" : "type-446",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel &",
-   "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-62",
-   "self_type" : "type-802",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry &",
-   "name" : "const android::hardware::ProcessState::handle_entry &",
-   "referenced_type" : "type-321",
-   "self_type" : "type-353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode &",
-   "name" : "const android::hardware::TypeCode &",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > &",
-   "referenced_type" : "type-314",
-   "self_type" : "type-317",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> &",
-   "referenced_type" : "type-479",
-   "self_type" : "type-481",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> &",
-   "name" : "const android::sp<android::hardware::BHwBinder> &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-711",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> &",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-141",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-5",
-   "self_type" : "type-30",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-505",
-   "self_type" : "type-507",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-145",
-   "self_type" : "type-144",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-196",
-   "self_type" : "type-198",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-211",
-   "self_type" : "type-213",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-625",
-   "self_type" : "type-628",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
-   "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-645",
-   "self_type" : "type-647",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> &",
-   "name" : "const android::sp<android::hardware::IInterface> &",
-   "referenced_type" : "type-655",
-   "self_type" : "type-654",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> &",
-   "name" : "const android::sp<android::hardware::ProcessState> &",
-   "referenced_type" : "type-537",
-   "self_type" : "type-680",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-109",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> &",
-   "name" : "const android::wp<android::hardware::IBinder> &",
-   "referenced_type" : "type-31",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const bool &",
-   "name" : "const bool &",
-   "referenced_type" : "type-37",
-   "self_type" : "type-470",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char &",
-   "name" : "const char &",
-   "referenced_type" : "type-377",
-   "self_type" : "type-595",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *const &",
-   "name" : "const char *const &",
-   "referenced_type" : "type-582",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const double &",
-   "name" : "const double &",
-   "referenced_type" : "type-330",
-   "self_type" : "type-496",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object &",
-   "name" : "const flat_binder_object &",
-   "referenced_type" : "type-79",
-   "self_type" : "type-81",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const float &",
-   "name" : "const float &",
-   "referenced_type" : "type-239",
-   "self_type" : "type-290",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int &",
-   "name" : "const int &",
-   "referenced_type" : "type-269",
-   "self_type" : "type-638",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg &",
-   "name" : "const log_msg &",
-   "referenced_type" : "type-168",
-   "self_type" : "type-171",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const long long &",
-   "name" : "const long long &",
-   "referenced_type" : "type-133",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const short &",
-   "name" : "const short &",
-   "referenced_type" : "type-474",
-   "self_type" : "type-475",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const signed char &",
-   "name" : "const signed char &",
-   "referenced_type" : "type-471",
-   "self_type" : "type-472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-245",
-   "self_type" : "type-247",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::function<void ()> &",
-   "name" : "const std::function<void ()> &",
-   "referenced_type" : "type-706",
-   "self_type" : "type-708",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-291",
-   "self_type" : "type-293",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> > &",
-   "referenced_type" : "type-76",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char &",
-   "name" : "const unsigned char &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *const &",
-   "name" : "const unsigned char *const &",
-   "referenced_type" : "type-790",
-   "self_type" : "type-791",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int &",
-   "name" : "const unsigned int &",
-   "referenced_type" : "type-56",
-   "self_type" : "type-55",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *const &",
-   "name" : "const unsigned int *const &",
-   "referenced_type" : "type-792",
-   "self_type" : "type-794",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long &",
-   "name" : "const unsigned long long &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-226",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned short &",
-   "name" : "const unsigned short &",
-   "referenced_type" : "type-476",
-   "self_type" : "type-477",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *const &",
-   "name" : "const void *const &",
-   "referenced_type" : "type-482",
-   "self_type" : "type-483",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int &",
-   "name" : "int &",
-   "referenced_type" : "type-10",
-   "self_type" : "type-619",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-129",
-   "self_type" : "type-128",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-259",
-   "self_type" : "type-258",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-429",
-   "self_type" : "type-428",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-801",
-   "self_type" : "type-800",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *const &",
-   "name" : "void *const &",
-   "referenced_type" : "type-732",
-   "self_type" : "type-733",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  }
- ],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-803",
-   "self_type" : "type-804",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-807",
-   "self_type" : "type-808",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-41",
-   "self_type" : "type-252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-110",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-176",
-   "self_type" : "type-175",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-382",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-434",
-   "self_type" : "type-433",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-541",
-   "self_type" : "type-540",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IPCThreadStateBase *",
-   "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-700",
-   "self_type" : "type-699",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-356",
-   "self_type" : "type-355",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-274",
-   "self_type" : "type-521",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-240",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-241",
-   "self_type" : "type-250",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-253",
-   "self_type" : "type-255",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-256",
-   "self_type" : "type-260",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-261",
-   "self_type" : "type-262",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-15",
-   "self_type" : "type-23",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase **",
-   "name" : "android::RefBase **",
-   "referenced_type" : "type-23",
-   "self_type" : "type-664",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *const *",
-   "name" : "android::RefBase *const *",
-   "referenced_type" : "type-669",
-   "self_type" : "type-670",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-160",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-188",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-203",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-219",
-   "self_type" : "type-218",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-264",
-   "self_type" : "type-263",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-334",
-   "self_type" : "type-333",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-420",
-   "self_type" : "type-419",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-601",
-   "self_type" : "type-600",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-642",
-   "self_type" : "type-641",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-652",
-   "self_type" : "type-651",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type **",
-   "name" : "android::RefBase::weakref_type **",
-   "referenced_type" : "type-20",
-   "self_type" : "type-663",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *const *",
-   "name" : "android::RefBase::weakref_type *const *",
-   "referenced_type" : "type-667",
-   "self_type" : "type-668",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-498",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-343",
-   "self_type" : "type-342",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-275",
-   "self_type" : "type-508",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-634",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-375",
-   "self_type" : "type-572",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase *> *",
-   "name" : "android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-689",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-685",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-693",
-   "self_type" : "type-694",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-681",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-249",
-   "self_type" : "type-248",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-272",
-   "self_type" : "type-271",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-512",
-   "self_type" : "type-514",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-710",
-   "self_type" : "type-709",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-621",
-   "self_type" : "type-622",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-620",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-3",
-   "self_type" : "type-409",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *",
-   "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-9",
-   "self_type" : "type-8",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder **",
-   "name" : "android::hardware::BHwBinder **",
-   "referenced_type" : "type-8",
-   "self_type" : "type-662",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder *const *",
-   "name" : "android::hardware::BHwBinder *const *",
-   "referenced_type" : "type-665",
-   "self_type" : "type-666",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-130",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BHwBinder::Extras *",
-   "name" : "android::hardware::BHwBinder::Extras *",
-   "referenced_type" : "type-147",
-   "self_type" : "type-146",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder *",
-   "name" : "android::hardware::BpHwBinder *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-650",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary *",
-   "name" : "android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-485",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-273",
-   "self_type" : "type-529",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BpHwRefBase *",
-   "name" : "android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-140",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput *",
-   "name" : "android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-606",
-   "self_type" : "type-607",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-186",
-   "self_type" : "type-185",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::BufferState *",
-   "name" : "android::hardware::BufferedTextOutput::BufferState *",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "name" : "android::hardware::BufferedTextOutput::ThreadState *",
-   "referenced_type" : "type-609",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::HexDump *",
-   "name" : "android::hardware::HexDump *",
-   "referenced_type" : "type-448",
-   "self_type" : "type-588",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder *",
-   "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-33",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient *",
-   "name" : "android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IInterface *",
-   "name" : "android::hardware::IInterface *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-657",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::IPCThreadState *",
-   "name" : "android::hardware::IPCThreadState *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-701",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Parcel *",
-   "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-71",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::PoolThread *",
-   "name" : "android::hardware::PoolThread *",
-   "referenced_type" : "type-341",
-   "self_type" : "type-340",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState *",
-   "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-368",
-   "self_type" : "type-367",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry *",
-   "name" : "android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "name" : "android::hardware::TextOutput &(*)(android::hardware::TextOutput &)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-585",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput *",
-   "name" : "android::hardware::TextOutput *",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput::Bundle *",
-   "name" : "android::hardware::TextOutput::Bundle *",
-   "referenced_type" : "type-579",
-   "self_type" : "type-581",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TypeCode *",
-   "name" : "android::hardware::TypeCode *",
-   "referenced_type" : "type-445",
-   "self_type" : "type-586",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-320",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-484",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Thread> *",
-   "name" : "android::sp<android::Thread> *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-338",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder> *",
-   "name" : "android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-538",
-   "self_type" : "type-697",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-574",
-   "self_type" : "type-604",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-506",
-   "self_type" : "type-526",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> *",
-   "name" : "android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-658",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::ProcessState> *",
-   "name" : "android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-366",
-   "self_type" : "type-543",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-112",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::hardware::IBinder> *",
-   "name" : "android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-478",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-221",
-   "self_type" : "type-225",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-372",
-   "self_type" : "type-371",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-38",
-   "self_type" : "type-98",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-114",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-806",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-522",
-   "self_type" : "type-523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-502",
-   "self_type" : "type-504",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > > *",
-   "referenced_type" : "type-345",
-   "self_type" : "type-346",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> > *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-510",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-610",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-542",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase *> *",
-   "name" : "const android::Vector<android::RefBase *> *",
-   "referenced_type" : "type-690",
-   "self_type" : "type-691",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "name" : "const android::Vector<android::RefBase::weakref_type *> *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-687",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-695",
-   "self_type" : "type-696",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "name" : "const android::Vector<android::hardware::BHwBinder *> *",
-   "referenced_type" : "type-682",
-   "self_type" : "type-683",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary> *",
-   "referenced_type" : "type-515",
-   "self_type" : "type-516",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry> *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-351",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> > *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-624",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-616",
-   "self_type" : "type-617",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BHwBinder *",
-   "name" : "const android::hardware::BHwBinder *",
-   "referenced_type" : "type-117",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder *",
-   "name" : "const android::hardware::BpHwBinder *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-285",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary *",
-   "name" : "const android::hardware::BpHwBinder::Obituary *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-488",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager *",
-   "referenced_type" : "type-530",
-   "self_type" : "type-531",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BpHwRefBase *",
-   "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-148",
-   "self_type" : "type-149",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput *",
-   "name" : "const android::hardware::BufferedTextOutput *",
-   "referenced_type" : "type-611",
-   "self_type" : "type-612",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::HexDump *",
-   "name" : "const android::hardware::HexDump *",
-   "referenced_type" : "type-447",
-   "self_type" : "type-590",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder *",
-   "name" : "const android::hardware::IBinder *",
-   "referenced_type" : "type-639",
-   "self_type" : "type-640",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient *",
-   "name" : "const android::hardware::IBinder::DeathRecipient *",
-   "referenced_type" : "type-524",
-   "self_type" : "type-525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IInterface *",
-   "name" : "const android::hardware::IInterface *",
-   "referenced_type" : "type-660",
-   "self_type" : "type-661",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::IPCThreadState *",
-   "name" : "const android::hardware::IPCThreadState *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Parcel *",
-   "name" : "const android::hardware::Parcel *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState *",
-   "name" : "const android::hardware::ProcessState *",
-   "referenced_type" : "type-384",
-   "self_type" : "type-385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry *",
-   "name" : "const android::hardware::ProcessState::handle_entry *",
-   "referenced_type" : "type-321",
-   "self_type" : "type-322",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::TypeCode *",
-   "name" : "const android::hardware::TypeCode *",
-   "referenced_type" : "type-444",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > *",
-   "referenced_type" : "type-314",
-   "self_type" : "type-323",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-486",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::Thread> *",
-   "name" : "const android::sp<android::Thread> *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-358",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder> *",
-   "name" : "const android::sp<android::hardware::BHwBinder> *",
-   "referenced_type" : "type-703",
-   "self_type" : "type-714",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState> *",
-   "referenced_type" : "type-598",
-   "self_type" : "type-605",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-528",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder> *",
-   "name" : "const android::sp<android::hardware::IBinder> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-789",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface> *",
-   "name" : "const android::sp<android::hardware::IInterface> *",
-   "referenced_type" : "type-655",
-   "self_type" : "type-659",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState> *",
-   "name" : "const android::sp<android::hardware::ProcessState> *",
-   "referenced_type" : "type-537",
-   "self_type" : "type-544",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-513",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder> *",
-   "name" : "const android::wp<android::hardware::IBinder> *",
-   "referenced_type" : "type-31",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-106",
-   "self_type" : "type-108",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const binder_buffer_object *",
-   "name" : "const binder_buffer_object *",
-   "referenced_type" : "type-302",
-   "self_type" : "type-304",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char *",
-   "name" : "const char *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-376",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const char16_t *",
-   "name" : "const char16_t *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-301",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const flat_binder_object *",
-   "name" : "const flat_binder_object *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-101",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-269",
-   "self_type" : "type-618",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const log_msg *",
-   "name" : "const log_msg *",
-   "referenced_type" : "type-168",
-   "self_type" : "type-170",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle *",
-   "name" : "const native_handle *",
-   "referenced_type" : "type-82",
-   "self_type" : "type-85",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-85",
-   "self_type" : "type-105",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned char *",
-   "name" : "const unsigned char *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned int *",
-   "name" : "const unsigned int *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-793",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const unsigned long long *",
-   "name" : "const unsigned long long *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void *",
-   "name" : "const void *",
-   "referenced_type" : "type-104",
-   "self_type" : "type-103",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const void **",
-   "name" : "const void **",
-   "referenced_type" : "type-103",
-   "self_type" : "type-102",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "double *",
-   "name" : "double *",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "float *",
-   "name" : "float *",
-   "referenced_type" : "type-95",
-   "self_type" : "type-94",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(void *)",
-   "name" : "int (*)(void *)",
-   "referenced_type" : "type-235",
-   "self_type" : "type-236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int *",
-   "name" : "int *",
-   "referenced_type" : "type-10",
-   "self_type" : "type-705",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "log_msg *",
-   "name" : "log_msg *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-177",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long *",
-   "name" : "long long *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "short *",
-   "name" : "short *",
-   "referenced_type" : "type-89",
-   "self_type" : "type-88",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "signed char *",
-   "name" : "signed char *",
-   "referenced_type" : "type-87",
-   "self_type" : "type-86",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "name" : "std::__1::basic_ostream<char> &(*)(std::__1::basic_ostream<char> &)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "name" : "std::unique_ptr<android::String16, std::default_delete<android::String16> > *",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned char *",
-   "name" : "unsigned char *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-65",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int *",
-   "name" : "unsigned int *",
-   "referenced_type" : "type-4",
-   "self_type" : "type-644",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned long long *",
-   "name" : "unsigned long long *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-67",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned short *",
-   "name" : "unsigned short *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(const void *, void *, void *)",
-   "name" : "void (*)(const void *, void *, void *)",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(void *, const char *)",
-   "name" : "void (*)(void *, const char *)",
-   "referenced_type" : "type-648",
-   "self_type" : "type-649",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Debug.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *",
-   "name" : "void *",
-   "referenced_type" : "type-13",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void **",
-   "name" : "void **",
-   "referenced_type" : "type-12",
-   "self_type" : "type-237",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase *const",
-   "name" : "android::RefBase *const",
-   "referenced_type" : "type-23",
-   "self_type" : "type-669",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-137",
-   "self_type" : "type-139",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-160",
-   "self_type" : "type-163",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-188",
-   "self_type" : "type-190",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-203",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-218",
-   "self_type" : "type-220",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-229",
-   "self_type" : "type-231",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-263",
-   "self_type" : "type-265",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-333",
-   "self_type" : "type-336",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-419",
-   "self_type" : "type-421",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-45",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-499",
-   "self_type" : "type-501",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-600",
-   "self_type" : "type-602",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-641",
-   "self_type" : "type-643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-651",
-   "self_type" : "type-653",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-677",
-   "self_type" : "type-679",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_type *const",
-   "name" : "android::RefBase::weakref_type *const",
-   "referenced_type" : "type-20",
-   "self_type" : "type-667",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::BHwBinder *const",
-   "name" : "android::hardware::BHwBinder *const",
-   "referenced_type" : "type-8",
-   "self_type" : "type-665",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::hardware::IBinder *const",
-   "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-33",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "char *const",
-   "name" : "char *const",
-   "referenced_type" : "type-114",
-   "self_type" : "type-113",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[10]",
-   "name" : "char const[10]",
-   "referenced_type" : "type-720",
-   "self_type" : "type-719",
-   "size" : 10,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[11]",
-   "name" : "char const[11]",
-   "referenced_type" : "type-742",
-   "self_type" : "type-741",
-   "size" : 11,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[12]",
-   "name" : "char const[12]",
-   "referenced_type" : "type-717",
-   "self_type" : "type-716",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[13]",
-   "name" : "char const[13]",
-   "referenced_type" : "type-713",
-   "self_type" : "type-712",
-   "size" : 13,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[14]",
-   "name" : "char const[14]",
-   "referenced_type" : "type-761",
-   "self_type" : "type-760",
-   "size" : 14,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[15]",
-   "name" : "char const[15]",
-   "referenced_type" : "type-122",
-   "self_type" : "type-121",
-   "size" : 15,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[16]",
-   "name" : "char const[16]",
-   "referenced_type" : "type-745",
-   "self_type" : "type-744",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[17]",
-   "name" : "char const[17]",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
-   "size" : 17,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[18]",
-   "name" : "char const[18]",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
-   "size" : 18,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[19]",
-   "name" : "char const[19]",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
-   "size" : 19,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[20]",
-   "name" : "char const[20]",
-   "referenced_type" : "type-758",
-   "self_type" : "type-757",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[22]",
-   "name" : "char const[22]",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
-   "size" : 22,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[25]",
-   "name" : "char const[25]",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
-   "size" : 25,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[28]",
-   "name" : "char const[28]",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[29]",
-   "name" : "char const[29]",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
-   "size" : 29,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[2]",
-   "name" : "char const[2]",
-   "referenced_type" : "type-723",
-   "self_type" : "type-722",
-   "size" : 2,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[31]",
-   "name" : "char const[31]",
-   "referenced_type" : "type-755",
-   "self_type" : "type-754",
-   "size" : 31,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[32]",
-   "name" : "char const[32]",
-   "referenced_type" : "type-786",
-   "self_type" : "type-785",
-   "size" : 32,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[35]",
-   "name" : "char const[35]",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
-   "size" : 35,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[37]",
-   "name" : "char const[37]",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
-   "size" : 37,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[3]",
-   "name" : "char const[3]",
-   "referenced_type" : "type-735",
-   "self_type" : "type-734",
-   "size" : 3,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[4]",
-   "name" : "char const[4]",
-   "referenced_type" : "type-119",
-   "self_type" : "type-118",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[5]",
-   "name" : "char const[5]",
-   "referenced_type" : "type-125",
-   "self_type" : "type-124",
-   "size" : 5,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[6]",
-   "name" : "char const[6]",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
-   "size" : 6,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[7]",
-   "name" : "char const[7]",
-   "referenced_type" : "type-752",
-   "self_type" : "type-751",
-   "size" : 7,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[8]",
-   "name" : "char const[8]",
-   "referenced_type" : "type-739",
-   "self_type" : "type-738",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "char const[9]",
-   "name" : "char const[9]",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
-   "size" : 9,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-803",
-   "self_type" : "type-805",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-356",
-   "self_type" : "type-357",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-274",
-   "self_type" : "type-522",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::RefBase",
-   "name" : "const android::RefBase",
-   "referenced_type" : "type-15",
-   "self_type" : "type-502",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-343",
-   "self_type" : "type-345",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "const android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-509",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String16",
-   "name" : "const android::String16",
-   "referenced_type" : "type-281",
-   "self_type" : "type-374",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::String8",
-   "name" : "const android::String8",
-   "referenced_type" : "type-375",
-   "self_type" : "type-535",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase *>",
-   "name" : "const android::Vector<android::RefBase *>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-690",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::RefBase::weakref_type *>",
-   "name" : "const android::Vector<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-519",
-   "self_type" : "type-686",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-693",
-   "self_type" : "type-695",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BHwBinder *>",
-   "name" : "const android::Vector<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-518",
-   "self_type" : "type-682",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "const android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-515",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "const android::Vector<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "const android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-621",
-   "self_type" : "type-623",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<int>",
-   "name" : "const android::Vector<int>",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::VectorImpl",
-   "name" : "const android::VectorImpl",
-   "referenced_type" : "type-179",
-   "self_type" : "type-178",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BHwBinder",
-   "name" : "const android::hardware::BHwBinder",
-   "referenced_type" : "type-9",
-   "self_type" : "type-117",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder",
-   "name" : "const android::hardware::BpHwBinder",
-   "referenced_type" : "type-268",
-   "self_type" : "type-267",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::Obituary",
-   "name" : "const android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-286",
-   "self_type" : "type-487",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager",
-   "referenced_type" : "type-273",
-   "self_type" : "type-530",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "const android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-494",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BpHwRefBase",
-   "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-134",
-   "self_type" : "type-148",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::BufferedTextOutput",
-   "name" : "const android::hardware::BufferedTextOutput",
-   "referenced_type" : "type-606",
-   "self_type" : "type-611",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::HexDump",
-   "name" : "const android::hardware::HexDump",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder",
-   "name" : "const android::hardware::IBinder",
-   "referenced_type" : "type-14",
-   "self_type" : "type-639",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IBinder::DeathRecipient",
-   "name" : "const android::hardware::IBinder::DeathRecipient",
-   "referenced_type" : "type-60",
-   "self_type" : "type-524",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IInterface",
-   "name" : "const android::hardware::IInterface",
-   "referenced_type" : "type-287",
-   "self_type" : "type-660",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::IPCThreadState",
-   "name" : "const android::hardware::IPCThreadState",
-   "referenced_type" : "type-536",
-   "self_type" : "type-702",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::Parcel",
-   "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState",
-   "name" : "const android::hardware::ProcessState",
-   "referenced_type" : "type-368",
-   "self_type" : "type-384",
-   "size" : 120,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::ProcessState::handle_entry",
-   "name" : "const android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-319",
-   "self_type" : "type-321",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::TypeCode",
-   "name" : "const android::hardware::TypeCode",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "const android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "const android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::Thread>",
-   "name" : "const android::sp<android::Thread>",
-   "referenced_type" : "type-34",
-   "self_type" : "type-349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BHwBinder>",
-   "name" : "const android::sp<android::hardware::BHwBinder>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-703",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "const android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "referenced_type" : "type-574",
-   "self_type" : "type-598",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::sp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-197",
-   "self_type" : "type-196",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-212",
-   "self_type" : "type-211",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-51",
-   "self_type" : "type-145",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-625",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
-   "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::IInterface>",
-   "name" : "const android::sp<android::hardware::IInterface>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
-   "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-366",
-   "self_type" : "type-537",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "const android::wp<android::hardware::IBinder::DeathRecipient>",
-   "referenced_type" : "type-58",
-   "self_type" : "type-57",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::wp<android::hardware::IBinder>",
-   "name" : "const android::wp<android::hardware::IBinder>",
-   "referenced_type" : "type-32",
-   "self_type" : "type-31",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-107",
-   "self_type" : "type-106",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const binder_buffer_object",
-   "name" : "const binder_buffer_object",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
-   "size" : 40,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const bool",
-   "name" : "const bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const char",
-   "name" : "const char",
-   "referenced_type" : "type-115",
-   "self_type" : "type-377",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const char *const",
-   "name" : "const char *const",
-   "referenced_type" : "type-376",
-   "self_type" : "type-582",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const char16_t",
-   "name" : "const char16_t",
-   "referenced_type" : "type-284",
-   "self_type" : "type-283",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const double",
-   "name" : "const double",
-   "referenced_type" : "type-97",
-   "self_type" : "type-330",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const flat_binder_object",
-   "name" : "const flat_binder_object",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const float",
-   "name" : "const float",
-   "referenced_type" : "type-95",
-   "self_type" : "type-239",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const int",
-   "name" : "const int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-269",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const log_msg",
-   "name" : "const log_msg",
-   "referenced_type" : "type-165",
-   "self_type" : "type-168",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const long long",
-   "name" : "const long long",
-   "referenced_type" : "type-93",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const native_handle",
-   "name" : "const native_handle",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const short",
-   "name" : "const short",
-   "referenced_type" : "type-89",
-   "self_type" : "type-474",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const signed char",
-   "name" : "const signed char",
-   "referenced_type" : "type-87",
-   "self_type" : "type-471",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-246",
-   "self_type" : "type-245",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<void ()>",
-   "name" : "const std::function<void ()>",
-   "referenced_type" : "type-707",
-   "self_type" : "type-706",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "name" : "const std::unique_ptr<android::String16, std::default_delete<android::String16> >",
-   "referenced_type" : "type-77",
-   "self_type" : "type-76",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char",
-   "name" : "const unsigned char",
-   "referenced_type" : "type-66",
-   "self_type" : "type-73",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned char *const",
-   "name" : "const unsigned char *const",
-   "referenced_type" : "type-72",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int",
-   "name" : "const unsigned int",
-   "referenced_type" : "type-4",
-   "self_type" : "type-56",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned int *const",
-   "name" : "const unsigned int *const",
-   "referenced_type" : "type-793",
-   "self_type" : "type-792",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned long long",
-   "name" : "const unsigned long long",
-   "referenced_type" : "type-68",
-   "self_type" : "type-75",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 2,
-   "is_const" : true,
-   "linker_set_key" : "const unsigned short",
-   "name" : "const unsigned short",
-   "referenced_type" : "type-91",
-   "self_type" : "type-476",
-   "size" : 2,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const void",
-   "name" : "const void",
-   "referenced_type" : "type-13",
-   "self_type" : "type-104",
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const void *const",
-   "name" : "const void *const",
-   "referenced_type" : "type-103",
-   "self_type" : "type-482",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "void *const",
-   "name" : "void *const",
-   "referenced_type" : "type-12",
-   "self_type" : "type-732",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h"
-  },
-  {
-   "alignment" : 1,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile bool",
-   "name" : "volatile bool",
-   "referenced_type" : "type-38",
-   "self_type" : "type-43",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h"
-  },
-  {
-   "alignment" : 4,
-   "is_volatile" : true,
-   "linker_set_key" : "volatile int",
-   "name" : "volatile int",
-   "referenced_type" : "type-10",
-   "self_type" : "type-270",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h"
-  }
- ],
- "record_types" :
- [
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-497"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "d_",
-     "field_offset" : 32,
-     "referenced_type" : "type-604"
-    },
-    {
-     "access" : "private",
-     "field_name" : "s_",
-     "field_offset" : 64,
-     "referenced_type" : "type-605"
-    }
-   ],
-   "linker_set_key" : "Renamer",
-   "name" : "Renamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jE7Renamer"
-    },
-    {
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jENK7RenamerclEj"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_8hardware18BufferedTextOutput11BufferStateEEEvPNS_2spIT_EEPKS7_jEN7RenamerD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-693"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-807",
-   "self_type" : "type-807",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CompileTimeAssert<true>",
-   "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/Debug.h",
-   "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCond",
-     "referenced_type" : "type-42"
-    }
-   ],
-   "linker_set_key" : "android::Condition",
-   "name" : "android::Condition",
-   "record_kind" : "class",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "unique_id" : "_ZTSN7android9ConditionE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-343"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-281", "type-51" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mVector",
-     "referenced_type" : "type-275"
-    }
-   ],
-   "linker_set_key" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::KeyedVector<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-103", "type-278" ],
-   "unique_id" : "_ZTSN7android11KeyedVectorIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "name" : "android::LightRefBase<android::VirtualLightRefBase>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-3" ],
-   "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-40"
-    }
-   ],
-   "linker_set_key" : "android::Mutex",
-   "name" : "android::Mutex",
-   "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5MutexE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-242"
-    }
-   ],
-   "linker_set_key" : "android::Mutex::Autolock",
-   "name" : "android::Mutex::Autolock",
-   "record_kind" : "class",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h",
-   "unique_id" : "_ZTSN7android5Mutex8AutolockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRWLock",
-     "referenced_type" : "type-254"
-    }
-   ],
-   "linker_set_key" : "android::RWLock",
-   "name" : "android::RWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-257"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoRLock",
-   "name" : "android::RWLock::AutoRLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "referenced_type" : "type-257"
-    }
-   ],
-   "linker_set_key" : "android::RWLock::AutoWLock",
-   "name" : "android::RWLock::AutoWLock",
-   "record_kind" : "class",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h",
-   "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-16"
-    }
-   ],
-   "linker_set_key" : "android::RefBase",
-   "name" : "android::RefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-15",
-   "self_type" : "type-15",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android7RefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android7RefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::RefBase::weakref_type",
-   "name" : "android::RefBase::weakref_type",
-   "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::ReferenceMover",
-   "name" : "android::ReferenceMover",
-   "record_kind" : "class",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android14ReferenceMoverE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer",
-   "name" : "android::ReferenceRenamer",
-   "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "unique_id" : "_ZTSN7android16ReferenceRenamerE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ReferenceRenamerE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16ReferenceRenamerclEj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-276"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "record_kind" : "class",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-344" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-276"
-    }
-   ],
-   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::SortedVector<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-277" ],
-   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE7do_copyEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE8do_splatEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE15do_move_forwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE16do_move_backwardEPvS3_j"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEE10do_compareES3_S3_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::SortedVectorImpl",
-   "name" : "android::SortedVectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android16SortedVectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16SortedVectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16SortedVectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android16SortedVectorImpl10do_compareEPKvS2_"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-282"
-    }
-   ],
-   "linker_set_key" : "android::String16",
-   "name" : "android::String16",
-   "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "unique_id" : "_ZTSN7android8String16E"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mString",
-     "referenced_type" : "type-376"
-    }
-   ],
-   "linker_set_key" : "android::String8",
-   "name" : "android::String8",
-   "record_kind" : "class",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "unique_id" : "_ZTSN7android7String8E"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCanCallJava",
-     "field_offset" : 32,
-     "referenced_type" : "type-37"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThread",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadExitedCondition",
-     "field_offset" : 128,
-     "referenced_type" : "type-41"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStatus",
-     "field_offset" : 160,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExitPending",
-     "field_offset" : 192,
-     "referenced_type" : "type-43"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRunning",
-     "field_offset" : 200,
-     "referenced_type" : "type-43"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHoldSelf",
-     "field_offset" : 224,
-     "referenced_type" : "type-34"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTid",
-     "field_offset" : 256,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "android::Thread",
-   "name" : "android::Thread",
-   "record_kind" : "class",
-   "referenced_type" : "type-36",
-   "self_type" : "type-36",
-   "size" : 44,
-   "source_file" : "/system/core/libutils/include/utils/Thread.h",
-   "unique_id" : "_ZTSN7android6ThreadE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 36,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread3runEPKcij"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread11requestExitEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android6Thread10readyToRunEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android6Thread10threadLoopEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -36,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6ThreadE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android6ThreadD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase *>",
-   "name" : "android::Vector<android::RefBase *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
-   "name" : "android::Vector<android::RefBase::weakref_type *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-693",
-   "self_type" : "type-693",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-375" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
-   "name" : "android::Vector<android::hardware::BHwBinder *>",
-   "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::Vector<android::hardware::BpHwBinder::Obituary>",
-   "record_kind" : "class",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware10BpHwBinder8ObituaryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware10BpHwBinder8ObituaryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware10BpHwBinder8ObituaryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
-   "record_kind" : "class",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::Vector<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "record_kind" : "class",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-179"
-    }
-   ],
-   "linker_set_key" : "android::Vector<int>",
-   "name" : "android::Vector<int>",
-   "record_kind" : "class",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android6VectorIiEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorIiEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorIiED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorIiE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mStorage",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 96,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mItemSize",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::VectorImpl",
-   "name" : "android::VectorImpl",
-   "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
-   "unique_id" : "_ZTSN7android10VectorImplE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android10VectorImplE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android10VectorImplD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl12do_constructEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl10do_destroyEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl7do_copyEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl8do_splatEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl15do_move_forwardEPvPKvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android10VectorImpl16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1"
-    }
-   ],
-   "linker_set_key" : "android::VirtualLightRefBase",
-   "name" : "android::VirtualLightRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android19VirtualLightRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android19VirtualLightRefBaseD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::aggregate_traits<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281", "type-51" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::aggregate_traits<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103", "type-278" ],
-   "unique_id" : "_ZTSN7android16aggregate_traitsIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPolicy",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mSchedPriority",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExtras",
-     "field_offset" : 96,
-     "referenced_type" : "type-11"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReserved0",
-     "field_offset" : 128,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BHwBinder",
-   "name" : "android::hardware::BHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
-   "size" : 28,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-14"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mHandle",
-     "field_offset" : 32,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 64,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlive",
-     "field_offset" : 96,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObitsSent",
-     "field_offset" : 128,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObituaries",
-     "field_offset" : 160,
-     "referenced_type" : "type-271"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 192,
-     "referenced_type" : "type-273"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mConstantData",
-     "field_offset" : 352,
-     "referenced_type" : "type-71"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDescriptorCache",
-     "field_offset" : 384,
-     "referenced_type" : "type-281"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder",
-   "name" : "android::hardware::BpHwBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
-   "size" : 60,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 52,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware10BpHwBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -52,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10BpHwBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10BpHwBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware10BpHwBinder10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware10BpHwBinder15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10BpHwBinder20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "recipient",
-     "referenced_type" : "type-58"
-    },
-    {
-     "field_name" : "cookie",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::Obituary",
-   "name" : "android::hardware::BpHwBinder::Obituary",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
-   "size" : 16,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder8ObituaryE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "referenced_type" : "type-274"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager",
-   "name" : "android::hardware::BpHwBinder::ObjectManager",
-   "record_kind" : "class",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManagerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "object",
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cleanupCookie",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "func",
-     "field_offset" : 64,
-     "referenced_type" : "type-279"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "name" : "android::hardware::BpHwBinder::ObjectManager::entry_t",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BpHwBinder.h",
-   "unique_id" : "_ZTSN7android8hardware10BpHwBinder13ObjectManager7entry_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mRemote",
-     "field_offset" : 32,
-     "referenced_type" : "type-135"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRefs",
-     "field_offset" : 64,
-     "referenced_type" : "type-20"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "field_offset" : 96,
-     "referenced_type" : "type-136"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BpHwRefBase",
-   "name" : "android::hardware::BpHwRefBase",
-   "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
-   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-440"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFlags",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSeq",
-     "field_offset" : 64,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "field_offset" : 96,
-     "referenced_type" : "type-269"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 128,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGlobalState",
-     "field_offset" : 160,
-     "referenced_type" : "type-575"
-    }
-   ],
-   "linker_set_key" : "android::hardware::BufferedTextOutput",
-   "name" : "android::hardware::BufferedTextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/BufferedTextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware18BufferedTextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware18BufferedTextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutputD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput5printEPKcj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10moveIndentEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10pushBundleEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput9popBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware18BufferedTextOutput10writeLinesERK5iovecj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBuffer",
-     "referenced_type" : "type-103"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSize",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBytesPerLine",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSingleLineCutoff",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAlignment",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCArrayStyle",
-     "field_offset" : 160,
-     "referenced_type" : "type-38"
-    }
-   ],
-   "linker_set_key" : "android::hardware::HexDump",
-   "name" : "android::hardware::HexDump",
-   "record_kind" : "class",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
-   "size" : 24,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware7HexDumpE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder",
-   "name" : "android::hardware::IBinder",
-   "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinderE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
-   "name" : "android::hardware::IBinder::DeathRecipient",
-   "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
-   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IInterface",
-   "name" : "android::hardware::IInterface",
-   "record_kind" : "class",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
-   "size" : 12,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
-   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mProcess",
-     "referenced_type" : "type-537"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingStrongDerefs",
-     "field_offset" : 32,
-     "referenced_type" : "type-518"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPendingWeakDerefs",
-     "field_offset" : 192,
-     "referenced_type" : "type-519"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteStrongDerefs",
-     "field_offset" : 352,
-     "referenced_type" : "type-520"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostWriteWeakDerefs",
-     "field_offset" : 512,
-     "referenced_type" : "type-519"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIn",
-     "field_offset" : 672,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOut",
-     "field_offset" : 1216,
-     "referenced_type" : "type-63"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastError",
-     "field_offset" : 1760,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingPid",
-     "field_offset" : 1792,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingSid",
-     "field_offset" : 1824,
-     "referenced_type" : "type-376"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallingUid",
-     "field_offset" : 1856,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStrictModePolicy",
-     "field_offset" : 1888,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastTransactionBinderFlags",
-     "field_offset" : 1920,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContextObject",
-     "field_offset" : 1952,
-     "referenced_type" : "type-538"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsLooper",
-     "field_offset" : 1984,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIsPollingThread",
-     "field_offset" : 1992,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostCommandTasks",
-     "field_offset" : 2016,
-     "referenced_type" : "type-539"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mIPCThreadStateBase",
-     "field_offset" : 2112,
-     "referenced_type" : "type-540"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 2144,
-     "referenced_type" : "type-378"
-    }
-   ],
-   "linker_set_key" : "android::hardware::IPCThreadState",
-   "name" : "android::hardware::IPCThreadState",
-   "record_kind" : "class",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
-   "size" : 272,
-   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
-   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBufCachePos",
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufCache",
-     "field_offset" : 32,
-     "referenced_type" : "type-64"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mError",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mData",
-     "field_offset" : 160,
-     "referenced_type" : "type-65"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataSize",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataCapacity",
-     "field_offset" : 224,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDataPos",
-     "field_offset" : 256,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjects",
-     "field_offset" : 288,
-     "referenced_type" : "type-67"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsSize",
-     "field_offset" : 320,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mObjectsCapacity",
-     "field_offset" : 352,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNextObjectHint",
-     "field_offset" : 384,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mNumRef",
-     "field_offset" : 416,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFdsKnown",
-     "field_offset" : 448,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHasFds",
-     "field_offset" : 456,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAllowFds",
-     "field_offset" : 464,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 480,
-     "referenced_type" : "type-69"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mOwnerCookie",
-     "field_offset" : 512,
-     "referenced_type" : "type-12"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel",
-   "name" : "android::hardware::Parcel",
-   "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
-   "size" : 68,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6ParcelE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "index",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "buffer",
-     "field_offset" : 32,
-     "referenced_type" : "type-68"
-    },
-    {
-     "field_name" : "bufend",
-     "field_offset" : 96,
-     "referenced_type" : "type-68"
-    }
-   ],
-   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
-   "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
-   "size" : 20,
-   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
-   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-15"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDriverFD",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mVMStart",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountLock",
-     "field_offset" : 96,
-     "referenced_type" : "type-369"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadCountDecrement",
-     "field_offset" : 128,
-     "referenced_type" : "type-370"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mExecutingThreadsCount",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMaxThreads",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mStarvationStartTimeMs",
-     "field_offset" : 224,
-     "referenced_type" : "type-93"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLock",
-     "field_offset" : 288,
-     "referenced_type" : "type-39"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mHandleToObject",
-     "field_offset" : 320,
-     "referenced_type" : "type-348"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mManagesContexts",
-     "field_offset" : 480,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextCheckFunc",
-     "field_offset" : 512,
-     "referenced_type" : "type-371"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBinderContextUserData",
-     "field_offset" : 544,
-     "referenced_type" : "type-12"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mContexts",
-     "field_offset" : 576,
-     "referenced_type" : "type-356"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRootDir",
-     "field_offset" : 736,
-     "referenced_type" : "type-375"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolStarted",
-     "field_offset" : 768,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSpawnThreadOnStart",
-     "field_offset" : 776,
-     "referenced_type" : "type-38"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mThreadPoolSeq",
-     "field_offset" : 800,
-     "referenced_type" : "type-270"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMmapSize",
-     "field_offset" : 832,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCallRestriction",
-     "field_offset" : 864,
-     "referenced_type" : "type-378"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState",
-   "name" : "android::hardware::ProcessState",
-   "record_kind" : "class",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
-   "size" : 120,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 112,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -112,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -112,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "binder",
-     "referenced_type" : "type-33"
-    },
-    {
-     "field_name" : "refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
-   "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
-   "size" : 8,
-   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::TextOutput",
-   "name" : "android::hardware::TextOutput",
-   "record_kind" : "class",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutputE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware10TextOutputE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware10TextOutputD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput5printEPKcj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10moveIndentEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput10pushBundleEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android8hardware10TextOutput9popBundleEv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mTO",
-     "referenced_type" : "type-580"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TextOutput::Bundle",
-   "name" : "android::hardware::TextOutput::Bundle",
-   "record_kind" : "class",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware10TextOutput6BundleE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mCode",
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "android::hardware::TypeCode",
-   "name" : "android::hardware::TypeCode",
-   "record_kind" : "class",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
-   "size" : 4,
-   "source_file" : "/system/libhwbinder/include/hwbinder/TextOutput.h",
-   "unique_id" : "_ZTSN7android8hardware8TypeCodeE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-281"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-51"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "name" : "android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281", "type-51" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "key",
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "value",
-     "field_offset" : 32,
-     "referenced_type" : "type-278"
-    }
-   ],
-   "linker_set_key" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103", "type-278" ],
-   "unique_id" : "_ZTSN7android16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-35"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Thread>",
-   "name" : "android::sp<android::Thread>",
-   "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-36" ],
-   "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
-   "name" : "android::sp<android::hardware::BHwBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-9" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-575"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "name" : "android::sp<android::hardware::BufferedTextOutput::BufferState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-577" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware18BufferedTextOutput11BufferStateEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IBinder>",
-   "name" : "android::sp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-657"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::IInterface>",
-   "name" : "android::sp<android::hardware::IInterface>",
-   "record_kind" : "class",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-287" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware10IInterfaceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-367"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
-   "name" : "android::sp<android::hardware::ProcessState>",
-   "record_kind" : "class",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-368" ],
-   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase *>",
-   "name" : "android::trait_pointer<android::RefBase *>",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "name" : "android::trait_pointer<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::String16>",
-   "name" : "android::trait_pointer<android::String16>",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "name" : "android::trait_pointer<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_pointer<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_pointer<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-405",
-   "self_type" : "type-405",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_pointer<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_pointer<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<const void *>",
-   "name" : "android::trait_pointer<const void *>",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_pointer<int>",
-   "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android13trait_pointerIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase *>",
-   "name" : "android::trait_trivial_copy<android::RefBase *>",
-   "referenced_type" : "type-810",
-   "self_type" : "type-810",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_copy<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-809",
-   "self_type" : "type-809",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::String16>",
-   "name" : "android::trait_trivial_copy<android::String16>",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_copy<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-799",
-   "self_type" : "type-799",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_copy<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_copy<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_copy<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_copy<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<bool>",
-   "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<char>",
-   "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<const void *>",
-   "name" : "android::trait_trivial_copy<const void *>",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<double>",
-   "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<float>",
-   "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<int>",
-   "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long long>",
-   "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<long>",
-   "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<short>",
-   "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-360",
-   "self_type" : "type-360",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
-   "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
-   "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
-   "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
-   "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
-   "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-386",
-   "self_type" : "type-386",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<void>",
-   "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase *>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_ctor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::String16>",
-   "name" : "android::trait_trivial_ctor<android::String16>",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_ctor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_ctor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-387",
-   "self_type" : "type-387",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_ctor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<bool>",
-   "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<char>",
-   "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<const void *>",
-   "name" : "android::trait_trivial_ctor<const void *>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<double>",
-   "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<float>",
-   "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<int>",
-   "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long long>",
-   "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<long>",
-   "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<short>",
-   "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
-   "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
-   "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
-   "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
-   "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
-   "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<void>",
-   "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase *>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_dtor<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-788",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::String16>",
-   "name" : "android::trait_trivial_dtor<android::String16>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_dtor<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_dtor<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_dtor<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<bool>",
-   "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<char>",
-   "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<const void *>",
-   "name" : "android::trait_trivial_dtor<const void *>",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<double>",
-   "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<float>",
-   "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<int>",
-   "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long long>",
-   "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<long>",
-   "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<short>",
-   "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
-   "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
-   "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-423",
-   "self_type" : "type-423",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
-   "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
-   "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
-   "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<void>",
-   "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase *>",
-   "name" : "android::trait_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::trait_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String16>",
-   "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::String8>",
-   "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-375" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::trait_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::trait_trivial_move<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::trait_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::trait_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "name" : "android::trait_trivial_move<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<bool>",
-   "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-38" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<char>",
-   "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-328",
-   "self_type" : "type-328",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-115" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<const void *>",
-   "name" : "android::trait_trivial_move<const void *>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<double>",
-   "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-97" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<float>",
-   "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-95" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<int>",
-   "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long long>",
-   "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-93" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<long>",
-   "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-427" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<short>",
-   "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-361",
-   "self_type" : "type-361",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-89" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned char>",
-   "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-66" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned int>",
-   "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
-   "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-68" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned long>",
-   "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-442" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<unsigned short>",
-   "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-91" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<void>",
-   "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-13" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase *>",
-   "name" : "android::traits<android::RefBase *>",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::RefBase::weakref_type *>",
-   "name" : "android::traits<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::String16>",
-   "name" : "android::traits<android::String16>",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-281" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8String16EEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BHwBinder *>",
-   "name" : "android::traits<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android6traitsIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::traits<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "name" : "android::traits<android::hardware::BpHwBinder::ObjectManager::entry_t>",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-278" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware10BpHwBinder13ObjectManager7entry_tEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::traits<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android6traitsINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::traits<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::traits<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::traits<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "name" : "android::traits<android::sp<android::hardware::IBinder> >",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-51" ],
-   "unique_id" : "_ZTSN7android6traitsINS_2spINS_8hardware7IBinderEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<const void *>",
-   "name" : "android::traits<const void *>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
-   "unique_id" : "_ZTSN7android6traitsIPKvEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::traits<int>",
-   "name" : "android::traits<int>",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android6traitsIiEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-676"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase *>",
-   "name" : "android::use_trivial_move<android::RefBase *>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-23" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBaseEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-674"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "name" : "android::use_trivial_move<android::RefBase::weakref_type *>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-673",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-20" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_7RefBase12weakref_typeEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-672"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "name" : "android::use_trivial_move<android::hardware::BHwBinder *>",
-   "referenced_type" : "type-671",
-   "self_type" : "type-671",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-8" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIPNS_8hardware9BHwBinderEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-492"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "name" : "android::use_trivial_move<android::hardware::BpHwBinder::Obituary>",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware10BpHwBinder8ObituaryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-325"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "name" : "android::use_trivial_move<android::hardware::ProcessState::handle_entry>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-319" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_8hardware12ProcessState12handle_entryEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-327"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-315" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-490"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "name" : "android::use_trivial_move<android::key_value_pair_t<const void *, android::hardware::BpHwBinder::ObjectManager::entry_t> >",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-480" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPKvNS_8hardware10BpHwBinder13ObjectManager7entry_tEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-636"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "name" : "android::use_trivial_move<android::sp<android::hardware::BufferedTextOutput::BufferState> >",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-574" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_8hardware18BufferedTextOutput11BufferStateEEEEE"
-  },
-  {
-   "alignment" : 1,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-415"
-    }
-   ],
-   "linker_set_key" : "android::use_trivial_move<int>",
-   "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-10" ],
-   "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "name" : "android::wp<android::hardware::IBinder::DeathRecipient>",
-   "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinder14DeathRecipientEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-33"
-    },
-    {
-     "access" : "private",
-     "field_name" : "m_refs",
-     "field_offset" : 32,
-     "referenced_type" : "type-20"
-    }
-   ],
-   "linker_set_key" : "android::wp<android::hardware::IBinder>",
-   "name" : "android::wp<android::hardware::IBinder>",
-   "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-14" ],
-   "unique_id" : "_ZTSN7android2wpINS_8hardware7IBinderEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "maxFrameAverageLightLevel",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_cta861_3_metadata",
-   "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_cta861_3_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "num_points",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 32,
-     "referenced_type" : "type-216"
-    },
-    {
-     "field_name" : "xyzc_points",
-     "field_offset" : 288,
-     "referenced_type" : "type-228"
-    }
-   ],
-   "linker_set_key" : "android_depth_points",
-   "name" : "android_depth_points",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
-   "size" : 36,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_depth_points"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "format",
-     "referenced_type" : "type-222"
-    },
-    {
-     "field_name" : "num_planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-225"
-    }
-   ],
-   "linker_set_key" : "android_flex_layout",
-   "name" : "android_flex_layout",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
-   "size" : 12,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_layout"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "top_left",
-     "referenced_type" : "type-65"
-    },
-    {
-     "field_name" : "component",
-     "field_offset" : 32,
-     "referenced_type" : "type-217"
-    },
-    {
-     "field_name" : "bits_per_component",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "bits_used",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "h_increment",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "v_increment",
-     "field_offset" : 160,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "h_subsampling",
-     "field_offset" : 192,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "v_subsampling",
-     "field_offset" : 224,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "android_flex_plane",
-   "name" : "android_flex_plane",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
-   "size" : 32,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_flex_plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "displayPrimaryGreen",
-     "field_offset" : 64,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "displayPrimaryBlue",
-     "field_offset" : 128,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "whitePoint",
-     "field_offset" : 192,
-     "referenced_type" : "type-232"
-    },
-    {
-     "field_name" : "maxLuminance",
-     "field_offset" : 256,
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "minLuminance",
-     "field_offset" : 288,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_smpte2086_metadata",
-   "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
-   "size" : 40,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_smpte2086_metadata"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-95"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-95"
-    }
-   ],
-   "linker_set_key" : "android_xy_color",
-   "name" : "android_xy_color",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
-   "size" : 8,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_xy_color"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "y",
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cb",
-     "field_offset" : 32,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "cr",
-     "field_offset" : 64,
-     "referenced_type" : "type-12"
-    },
-    {
-     "field_name" : "ystride",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "cstride",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "chroma_step",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 192,
-     "referenced_type" : "type-216"
-    }
-   ],
-   "linker_set_key" : "android_ycbcr",
-   "name" : "android_ycbcr",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
-   "size" : 56,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "unique_id" : "android_ycbcr"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "log_msg",
-   "name" : "log_msg",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "buf",
-     "referenced_type" : "type-167"
-    },
-    {
-     "field_name" : "entry",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "entry_v4",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "entry_v3",
-     "referenced_type" : "type-162"
-    },
-    {
-     "field_name" : "entry_v2",
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "entry_v1",
-     "referenced_type" : "type-157"
-    }
-   ],
-   "is_anonymous" : true,
-   "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
-   "record_kind" : "union",
-   "referenced_type" : "type-166",
-   "self_type" : "type-166",
-   "size" : 5124,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "tv_sec",
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "tv_nsec",
-     "field_offset" : 32,
-     "referenced_type" : "type-4"
-    }
-   ],
-   "linker_set_key" : "log_time",
-   "name" : "log_time",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
-   "size" : 8,
-   "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
-   "unique_id" : "_ZTS8log_time"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "__pad",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 160,
-     "referenced_type" : "type-158"
-    }
-   ],
-   "linker_set_key" : "logger_entry",
-   "name" : "logger_entry",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 20,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "euid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-158"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v2",
-   "name" : "logger_entry_v2",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v2"
-  },
-  {
-   "alignment" : 1,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 192,
-     "referenced_type" : "type-158"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v3",
-   "name" : "logger_entry_v3",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 24,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v3"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "len",
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "hdr_size",
-     "field_offset" : 16,
-     "referenced_type" : "type-91"
-    },
-    {
-     "field_name" : "pid",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tid",
-     "field_offset" : 64,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "sec",
-     "field_offset" : 96,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "nsec",
-     "field_offset" : 128,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "lid",
-     "field_offset" : 160,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "uid",
-     "field_offset" : 192,
-     "referenced_type" : "type-4"
-    },
-    {
-     "field_name" : "msg",
-     "field_offset" : 224,
-     "referenced_type" : "type-158"
-    }
-   ],
-   "linker_set_key" : "logger_entry_v4",
-   "name" : "logger_entry_v4",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 28,
-   "source_file" : "/system/core/liblog/include/log/log_read.h",
-   "unique_id" : "logger_entry_v4"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "version",
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "numFds",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "numInts",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 96,
-     "referenced_type" : "type-84"
-    }
-   ],
-   "linker_set_key" : "native_handle",
-   "name" : "native_handle",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
-   "unique_id" : "native_handle"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "lock",
-     "referenced_type" : "type-614"
-    },
-    {
-     "field_name" : "has_tls",
-     "field_offset" : 32,
-     "referenced_type" : "type-10"
-    },
-    {
-     "field_name" : "tls",
-     "field_offset" : 64,
-     "referenced_type" : "type-10"
-    }
-   ],
-   "linker_set_key" : "thread_store_t",
-   "name" : "thread_store_t",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
-   "size" : 12,
-   "source_file" : "/system/core/libcutils/include/cutils/threads.h",
-   "unique_id" : "thread_store_t"
-  }
- ],
- "rvalue_reference_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "name" : "android::sp<android::hardware::IBinder::DeathRecipient> &&",
-   "referenced_type" : "type-506",
-   "self_type" : "type-527",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hardware::IBinder> &&",
-   "name" : "android::sp<android::hardware::IBinder> &&",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  }
- ]
-}